Merge version_2 into main

2026-05-08 01:15:32 +00:00
parent 424f341a73 7ad57a3936
commit 0528d8b8f7
2 changed files with 11 additions and 4 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,7 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Open_Sans } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -20,8 +21,14 @@ export const metadata: Metadata = {
  },
 };

-const openSans = Open_Sans({
-  variable: "--font-open-sans",
+
+
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});
+const inter = Inter({
+  variable: "--font-inter",
  subsets: ["latin"],
 });

@@ -33,7 +40,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${openSans.variable} antialiased`}>
+        <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
          
          {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-open-sans), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }