Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-04-24 03:25:42 +00:00
3 changed files with 9 additions and 5 deletions

View File

@@ -19,7 +19,11 @@ export const metadata: Metadata = {
},
};
const dmSans = DM_Sans({ variable: "--font-dm-sans", subsets: ["latin"] });
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export default function RootLayout({
children,
@@ -29,7 +33,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${dmSans.variable} antialiased`}>
<body className={`${halant.variable} antialiased`}>
{children}
<script

View File

@@ -164,4 +164,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

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