Merge version_14 into main

Merge version_14 into main
This commit was merged in pull request #26.
This commit is contained in:
2026-06-10 20:04:30 +00:00
2 changed files with 6 additions and 4 deletions

View File

@@ -8,6 +8,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Raleway } from "next/font/google";
import { Poppins } from "next/font/google";
import { Montserrat } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -18,8 +19,9 @@ export const metadata: Metadata = {
const montserrat = Montserrat({
variable: "--font-montserrat",
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
@@ -35,7 +37,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} ${inter.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
{children}
<script

View File

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