Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #4.
This commit is contained in:
2026-04-11 13:37:27 +00:00
2 changed files with 8 additions and 5 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 { Montserrat } from "next/font/google";
import { Roboto } from "next/font/google";
@@ -18,9 +19,11 @@ export const metadata: Metadata = {
},
};
const montserrat = Montserrat({
variable: "--font-montserrat",
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
});
export default function RootLayout({
@@ -31,7 +34,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}>
<body className={`${roboto.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-roboto), 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-roboto), sans-serif;
}