bender/e82810be-934a-476d-a31f-9a1d924530b3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_10 into main

Browse Source 
Merge version_10 into main
This commit was merged in pull request #15.
This commit is contained in:
bender
2026-05-28 11:25:30 +00:00
parent 4b5e1bc71e 3ee5d262e9
commit 783fddf4ab
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -9,6 +9,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { DM_Sans } from "next/font/google";
import { Inter_Tight } from "next/font/google";
import { Poppins } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -45,10 +46,10 @@ export const metadata: Metadata = {
const poppins = Poppins({
variable: "--font-poppins",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -59,7 +60,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${poppins.variable} antialiased`}>
<body className={`${montserrat.variable} antialiased`}>
<Tag />
{children}
<script

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-poppins), sans-serif;
font-family: var(--font-montserrat), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-poppins), sans-serif;
font-family: var(--font-montserrat), sans-serif;
}