bender/5b0d90bc-2a3b-4142-80e0-590e451551d5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #1.
This commit is contained in:
bender
2026-05-10 21:19:41 +00:00
parent 690ee46164 4156595c3d
commit 8785d5b6ac
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/layout.tsx
View File

@@ -22,14 +22,15 @@ export const metadata: Metadata = {
}, },
}; };
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({ const dmSans = DM_Sans({
variable: "--font-dm-sans", variable: "--font-dm-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
@@ -39,7 +40,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}> <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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

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