Merge version_2 into main

2026-02-13 20:21:53 +00:00
parent bd45fff63f 567b48d916
commit 759727011e
2 changed files with 13 additions and 4 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,6 +4,8 @@ import { Inter } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
+import { Montserrat } from "next/font/google";
+import { Inter } from "next/font/google";

 const notoSans = Noto_Sans({
  variable: "--font-noto-sans",  subsets: ["latin"],
@@ -36,6 +38,15 @@ export const metadata: Metadata = {
  }
 };

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