4 Commits

Author SHA1 Message Date
b4c2e51437 Merge version_4 into main
Merge version_4 into main
2026-05-24 13:10:14 +00:00
40802c093c Update src/app/styles/base.css 2026-05-24 13:10:08 +00:00
f118e39bad Update src/app/layout.tsx 2026-05-24 13:10:07 +00:00
948c0a611b Merge version_3 into main
Merge version_3 into main
2026-05-24 13:07:49 +00:00
2 changed files with 9 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 { Montserrat } from "next/font/google";
import { Playfair_Display } from "next/font/google";
@@ -19,7 +20,11 @@ export const metadata: Metadata = {
},
};
const montserrat = Montserrat({ variable: "--font-montserrat", subsets: ["latin"] });
const playfairDisplay = Playfair_Display({
variable: "--font-playfair-display", subsets: ["latin"],
weight: ["400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
children,
@@ -29,7 +34,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}>
<body className={`${playfairDisplay.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-playfair-display), 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-playfair-display), sans-serif;
}