Merge version_6 into main

2026-05-16 05:12:31 +00:00
parent c41863d756 bac29292d2
commit 012d8e7e8e
2 changed files with 12 additions and 3 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 { Manrope } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -25,7 +26,15 @@ export const metadata: Metadata = {
  },
 };

-const manrope = Manrope({ variable: "--font-manrope", subsets: ["latin"] });
+
+const manrope = Manrope({
+  variable: "--font-manrope",
+  subsets: ["latin"],
+});
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});

 export default function RootLayout({
  children,
@@ -35,7 +44,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${manrope.variable} antialiased`}>
+        <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
          
          {children}
          <script
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;