Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -17,7 +17,7 @@ import { Wrench, Droplet, Search } from "lucide-react";
 export default function LandingPage() {
   return (
     <ThemeProvider
-      defaultButtonVariant="bounce-effect"
+      defaultButtonVariant="directional-hover"
       defaultTextAnimation="entrance-slide"
       borderRadius="rounded"
       contentWidth="medium"
@@ -32,15 +32,15 @@ export default function LandingPage() {
         <NavbarLayoutFloatingOverlay
           brandName="Dania Plumbing Services"
           navItems={[
-            { "name": "Home", "id": "home" },
-            { "name": "Services", "id": "services" },
-            { "name": "About Us", "id": "about" },
-            { "name": "Testimonials", "id": "testimonials" },
-            { "name": "FAQ", "id": "faq" },
-            { "name": "Contact", "id": "contact" }
+            { "name": "Home", "id": "#home" },
+            { "name": "Services", "id": "#services" },
+            { "name": "About Us", "id": "#about" },
+            { "name": "Testimonials", "id": "#testimonials" },
+            { "name": "FAQ", "id": "#faq" },
+            { "name": "Contact", "id": "#contact" }
           ]}
           button={{
-            "text": "Get A Free Quote",            "href": "contact"
+            "text": "Get A Free Quote",            "href": "#contact"
           }}
         />
       </div>
@@ -68,8 +68,8 @@ export default function LandingPage() {
           ]}
           tag="Emergency Service"
           buttons={[
-            { "text": "Schedule Service", "href": "contact" },
-            { "text": "See Our Work", "href": "services" }
+            { "text": "Schedule Service", "href": "#contact" },
+            { "text": "See Our Work", "href": "#services" }
           ]}
           carouselPosition="right"
           tagAnimation="slide-up"
@@ -223,20 +223,20 @@ export default function LandingPage() {
           logoText="Dania Plumbing Services"
           columns={[
             { "items": [
-                { "label": "Emergency Service", "href": "services" },
-                { "label": "Water Heater Repair", "href": "services" },
-                { "label": "Leak Detection", "href": "services" },
-                { "label": "Drain Cleaning", "href": "packages" }
+                { "label": "Emergency Service", "href": "#services" },
+                { "label": "Water Heater Repair", "href": "#services" },
+                { "label": "Leak Detection", "href": "#services" },
+                { "label": "Drain Cleaning", "href": "#packages" }
             ]},
             { "items": [
-                { "label": "About Us", "href": "about" },
-                { "label": "Our Values", "href": "about" },
-                { "label": "Testimonials", "href": "testimonials" },
-                { "label": "Areas Served", "href": "faq" }
+                { "label": "About Us", "href": "#about" },
+                { "label": "Our Values", "href": "#about" },
+                { "label": "Testimonials", "href": "#testimonials" },
+                { "label": "Areas Served", "href": "#faq" }
             ]},
             { "items": [
-                { "label": "FAQ", "href": "faq" },
-                { "label": "Contact Us", "href": "contact" },
+                { "label": "FAQ", "href": "#faq" },
+                { "label": "Contact Us", "href": "#contact" },
                 { "label": "Privacy Policy", "href": "#" },
                 { "label": "Terms of Service", "href": "#" }
             ]}

src/app/styles/base.css

@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-dm-sans), sans-serif;
+  font-family: var(--font-libre-baskerville), serif;
 }

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #F8F8F6;
-  --card: #EEF1F5;
-  --foreground: #0B1F3A;
-  --primary-cta: #C9A84C;
+  --background: #f5f4f0;
+  --card: #ffffff;
+  --foreground: #1a1a1a;
+  --primary-cta: #2c2c2c;
   --primary-cta-text: #F8F8F6;
-  --secondary-cta: #0B1F3A;
+  --secondary-cta: #f5f4f0;
   --secondary-cta-text: #F8F8F6;
-  --accent: #2C5F8A;
-  --background-accent: #C9A84C;
+  --accent: #8a8a8a;
+  --background-accent: #e8e6e1;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);