bender/25ed7ad0-bc3d-486f-a504-2b3acdeff0eb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #5

Merged
bender merged 2 commits from version_4 into main 2026-06-11 02:04:24 +00:00
Conversation 0 Commits 2 Files Changed 2 +7 -8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4faa74081a - Show all commits

15
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -41,13 +42,11 @@ export const metadata: Metadata = {
}, },
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans", const poppins = Poppins({
subsets: ["latin"] variable: "--font-poppins",
}); subsets: ["latin"],
const inter = Inter({ weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
variable: "--font-inter",
subsets: ["latin"]
}); });
export default function RootLayout({ export default function RootLayout({
@@ -58,7 +57,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${poppins.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script