Merge version_8 into main

Merge version_8 into main
This commit was merged in pull request #18.
This commit is contained in:
2026-06-10 08:16:53 +00:00
2 changed files with 6 additions and 4 deletions

View File

@@ -10,6 +10,7 @@ import { Libre_Baskerville } from "next/font/google";
import { Inter_Tight } from "next/font/google"; import { Inter_Tight } from "next/font/google";
import { Mulish } from "next/font/google"; import { Mulish } from "next/font/google";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -46,8 +47,9 @@ export const metadata: Metadata = {
const dmSans = DM_Sans({
variable: "--font-dm-sans", const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"], subsets: ["latin"],
}); });
const inter = Inter({ const inter = Inter({
@@ -63,7 +65,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${montserrat.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

View File

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-montserrat), sans-serif;
} }