Merge version_2 into main

2026-05-30 04:19:43 +00:00
parent 25431638a0 db71fe0404
commit 22997a1893
2 changed files with 6 additions and 5 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Nunito } from "next/font/google";
 import { Libre_Baskerville } from "next/font/google";
+import { Mulish } from "next/font/google";



@@ -42,10 +43,10 @@ export const metadata: Metadata = {
 };


-const libreBaskerville = Libre_Baskerville({
-  variable: "--font-libre-baskerville",
+
+const mulish = Mulish({
+  variable: "--font-mulish",
  subsets: ["latin"],
-  weight: ["400", "700"],
 });
 const inter = Inter({
  variable: "--font-inter",
@@ -60,7 +61,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
+        <body className={`${mulish.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-libre-baskerville), serif;
+  font-family: var(--font-mulish), sans-serif;
 }