development/433023da-3941-4a7e-a26c-c9ec385559a2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
development merged 2 commits from version_1 into main 2026-02-09 13:41:06 +00:00
Conversation 0 Commits 2 Files Changed 2 +12 -1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87bf60b068 - Show all commits

13
src/app/layout.tsx
View File

@@ -5,6 +5,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { Work_Sans } from "next/font/google"; import { Work_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Inter } from "next/font/google";
const interTight = Inter_Tight({ const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"], variable: "--font-inter-tight", subsets: ["latin"],
@@ -38,6 +40,15 @@ const workSans = Work_Sans({
subsets: ["latin"], subsets: ["latin"],
}); });
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -46,7 +57,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${openSans.variable} ${workSans.variable} antialiased`}> <body className={`${montserrat.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}