Merge version_25 into main #28

Merged
bender merged 2 commits from version_25 into main 2026-04-23 23:43:31 +00:00
2 changed files with 9 additions and 4 deletions

View File

@@ -6,6 +6,7 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Mulish } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -14,7 +15,11 @@ export const metadata: Metadata = {
description: 'Transform your bite, breathe better, and sleep deeper with specialized orofacial myofunctional therapy sessions and wellness courses by Olivia Lallouz.',
};
const mulish = Mulish({ variable: "--font-mulish", subsets: ["latin"] });
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
@@ -24,7 +29,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} antialiased`}>
<body className={`${dmSans.variable} antialiased`}>
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-mulish), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-mulish), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
}