Merge version_7 into main

Merge version_7 into main
This commit was merged in pull request #13.
This commit is contained in:
2026-04-12 03:27:39 +00:00
2 changed files with 7 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Nunito_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
@@ -27,8 +28,9 @@ export const metadata: Metadata = {
const montserrat = Montserrat({
variable: "--font-montserrat",
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
@@ -40,7 +42,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}>
<body className={`${manrope.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-manrope), 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-manrope), sans-serif;
}