Merge version_11 into main #11

Merged
bender merged 2 commits from version_11 into main 2026-04-21 13:12:07 +00:00
2 changed files with 6 additions and 4 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Mulish } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -15,8 +16,9 @@ export const metadata: Metadata = {
description: "Generated by create next app",
};
const mulish = Mulish({
variable: "--font-mulish",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
@@ -32,7 +34,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<body className={`${montserrat.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

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