Merge version_11 into main #17

Merged
bender merged 2 commits from version_11 into main 2026-05-10 18:22:59 +00:00
2 changed files with 6 additions and 9 deletions

View File

@@ -26,12 +26,9 @@ export const metadata: Metadata = {
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
@@ -43,7 +40,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<body className={`${montserrat.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter), 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-mulish), sans-serif;
font-family: var(--font-montserrat), sans-serif;
}