Merge version_4 into main #13

Merged
bender merged 2 commits from version_4 into main 2026-04-16 21:19:18 +00:00
2 changed files with 6 additions and 5 deletions

View File

@@ -33,8 +33,9 @@ export const metadata: Metadata = {
const montserrat = Montserrat({
variable: "--font-montserrat",
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
@@ -46,7 +47,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}>
<body className={`${dmSans.variable} antialiased`}>
<Tag />
{children}
<script

View File

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