Merge version_1 into main

2026-03-10 20:28:03 +00:00
parent 0254e1d179 21e405ff63
commit c83d3557da
2 changed files with 9 additions and 18 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,22 +6,10 @@ import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Manrope } from "next/font/google";

-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});

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

 export const metadata: Metadata = {
  title: "W&M Services | Professional Landscaping in Washington DC",
@@ -56,6 +44,11 @@ export const metadata: Metadata = {
  },
 };

+const manrope = Manrope({
+  variable: "--font-manrope",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
  children,
 }: Readonly<{
@@ -64,9 +57,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${dmSans.variable} antialiased`}
-        >
+        <body className={`${manrope.variable} antialiased`}>
          <Tag />
          {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: ;
+  font-family:var(--font-manrope), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: ;
+  font-family:var(--font-manrope), sans-serif;
 }