Merge version_1 into main

2026-04-12 03:18:09 +00:00
parent 46d4e0dd0f 09c9ba503d
commit 53015dda7b
2 changed files with 6 additions and 4 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Public_Sans } from "next/font/google";
+import { Montserrat } from "next/font/google";



@@ -22,8 +23,9 @@ export const metadata: Metadata = {
 };


-const publicSans = Public_Sans({
-  variable: "--font-public-sans",
+
+const montserrat = Montserrat({
+  variable: "--font-montserrat",
  subsets: ["latin"],
 });
 const inter = Inter({
@@ -39,7 +41,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${publicSans.variable} ${inter.variable} antialiased`}>
+        <body className={`${montserrat.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-public-sans), sans-serif;
+  font-family: var(--font-montserrat), sans-serif;
 }