development/daba9b53-36bf-430f-8aff-374b4099e1f4
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
development merged 3 commits from version_2 into main 2026-01-06 11:17:30 +00:00
Conversation 0 Commits 3 Files Changed 3 +11 -6
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7745000316 - Show all commits

17
src/app/layout.tsx
View File

@@ -1,13 +1,18 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Lato } from "next/font/google"; import { Playfair_Display, Roboto } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const lato = Lato({ const playfairDisplay = Playfair_Display({
variable: "--font-lato", variable: "--font-playfair-display",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"], });
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -49,7 +54,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={lato.variable} className={`${playfairDisplay.variable} ${roboto.variable}`}
> >
<Tag /> <Tag />
{children} {children}
@@ -1275,4 +1280,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }