Merge version_5 into main

Update src/app/globals.css
2026-01-22 21:44:51 +00:00 · 2026-01-22 21:44:46 +00:00 · 2026-01-22 21:34:46 +00:00 · 2026-01-22 21:34:41 +00:00 · 2026-01-22 21:34:41 +00:00 · 2026-01-22 21:34:40 +00:00
4 changed files with 40 additions and 45 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -5,7 +5,7 @@ import ReactLenis from "lenis/react";
 import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 import FooterSimple from '@/components/sections/footer/FooterSimple';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';

 type BlogPost = {
    id: string;
@@ -86,7 +86,7 @@ export default function BlogPage() {
        <ThemeProvider
            defaultButtonVariant="directional-hover"
            defaultTextAnimation="reveal-blur"
-            borderRadius="sharp"
+            borderRadius="pill"
            contentWidth="small"
            sizing="medium"
            background="circleGradient"
@@ -97,15 +97,16 @@ export default function BlogPage() {
        >
            <ReactLenis root>
                <div className="min-h-screen bg-background">
-                    <NavbarLayoutFloatingInline
-                        brandName="A Detailing"
+                    <NavbarStyleFullscreen
                        navItems={[
-                            { name: "Home", id: "/home" },
+                            { name: "Home", id: "/" },
                            { name: "Services", id: "services" },
                            { name: "Why Us", id: "about" },
                            { name: "Contact", id: "contact" }
                        ]}
-                        button={{ text: "Book Now", href: "#contact" }}
+                        brandName="A Detailing"
+                        bottomLeftText="San Diego, CA"
+                        bottomRightText="hello@adetailing.com"
                    />

                    {isLoading ? (
@@ -155,4 +156,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -4,21 +4,21 @@
  /* Base units */
  /* --vw is set by ThemeProvider */

-  /* --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #6139e6;;
+  /* --background: #ffffff;;
+  --card: #f5f5f5;;
+  --foreground: #1a1a1a;;
+  --primary-cta: #7c3aed;;
  --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;; */
+  --accent: #a78bfa;;
+  --background-accent: #ede9fe;; */

-  --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #6139e6;;
+  --background: #ffffff;;
+  --card: #f5f5f5;;
+  --foreground: #1a1a1a;;
+  --primary-cta: #7c3aed;;
  --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;;
+  --accent: #a78bfa;;
+  --background-accent: #ede9fe;;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -578,7 +578,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-source-code-pro), sans-serif;
+  font-family: var(--font-inter), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -591,5 +591,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-source-code-pro), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,11 +1,11 @@
 import type { Metadata } from "next";
-import { Source_Code_Pro } from "next/font/google";
+import { Inter } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";

-const sourceCodePro = Source_Code_Pro({
-  variable: "--font-source-code-pro",  subsets: ["latin"],
+const inter = Inter({
+  variable: "--font-inter",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
@@ -36,7 +36,7 @@ export default function RootLayout({
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
        <body
-          className={`${sourceCodePro.variable} antialiased`}
+          className={`${inter.variable} antialiased`}
        >
          <Tag />
          {children}
@@ -1262,4 +1262,4 @@ export default function RootLayout({
      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,8 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
 import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 import MediaSplitTabsAbout from '@/components/sections/about/MediaSplitTabsAbout';
 import MetricCardTwo from '@/components/sections/metrics/MetricCardTwo';
@@ -15,7 +15,7 @@ export default function LandingPage() {
    <ThemeProvider
      defaultButtonVariant="directional-hover"
      defaultTextAnimation="reveal-blur"
-      borderRadius="sharp"
+      borderRadius="pill"
      contentWidth="small"
      sizing="medium"
      background="circleGradient"
@@ -25,36 +25,30 @@ export default function LandingPage() {
      headingFontWeight="light"
    >
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingInline
-          brandName="A Detailing"
+        <NavbarStyleFullscreen
          navItems={[
            { name: "Services", id: "services" },
            { name: "Why Us", id: "about" },
            { name: "Contact", id: "contact" }
          ]}
-          button={{ text: "Book Now", href: "#contact" }}
+          brandName="A Detailing"
+          bottomLeftText="San Diego, CA"
+          bottomRightText="hello@adetailing.com"
        />
      </div>

      <div id="hero" data-section="hero">
-        <HeroBillboardRotatedCarousel
+        <HeroSplit
          title="A Detailing"
          description="Premium auto detailing services in San Diego, near SDSU. Expert hand-washing, polishing, and protective coatings for cars that shine."
-          background={{ variant: "plain" }}
+          background={{ variant: "glowing-orb" }}
          buttons={[
            { text: "Book Your Appointment", href: "#contact" },
            { text: "Learn More", href: "#services" }
          ]}
-          carouselItems={[
-            { id: "1", imageSrc: "https://img.b2bpic.net/free-photo/car-wash-detailing-station_1303-22299.jpg", imageAlt: "Professional auto detailing showcase" },
-            { id: "2", imageSrc: "https://img.b2bpic.net/free-photo/man-polishing-car-with-orbital-applicator_1303-30576.jpg", imageAlt: "Car polishing service" },
-            { id: "3", imageSrc: "https://img.b2bpic.net/free-photo/close-up-person-cleaning-car-exterior_23-2148194139.jpg", imageAlt: "Exterior detailing" },
-            { id: "4", imageSrc: "https://img.b2bpic.net/free-photo/close-up-person-cleaning-car-exterior_23-2148194132.jpg", imageAlt: "Professional cleaning" },
-            { id: "5", imageSrc: "https://img.b2bpic.net/free-photo/car-wash-detailing-station_1303-22299.jpg", imageAlt: "Detailing station" },
-            { id: "6", imageSrc: "https://img.b2bpic.net/free-photo/man-polishing-car-with-orbital-applicator_1303-30576.jpg", imageAlt: "Polishing service" }
-          ]}
-          autoPlay={true}
-          autoPlayInterval={4000}
+          imageSrc="https://img.b2bpic.net/free-photo/car-wash-detailing-station_1303-22299.jpg"
+          imageAlt="Professional auto detailing showcase"
+          imagePosition="right"
        />
      </div>

@@ -201,4 +195,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
Author	SHA1	Message	Date
development	fa43a3817a	Merge version_5 into main Merge version_5 into main	2026-01-22 21:44:51 +00:00
development	71a6b5d465	Update src/app/globals.css	2026-01-22 21:44:46 +00:00
development	52adbf4b8f	Merge version_4 into main Merge version_4 into main	2026-01-22 21:34:46 +00:00
development	d8d28420ce	Update src/app/page.tsx	2026-01-22 21:34:41 +00:00
development	1edff1ec5b	Update src/app/layout.tsx	2026-01-22 21:34:41 +00:00
development	12ada74591	Update src/app/globals.css	2026-01-22 21:34:40 +00:00
development	974175ee07	Update src/app/blog/page.tsx	2026-01-22 21:34:39 +00:00
development	20ec823614	Merge version_3 into main Merge version_3 into main	2026-01-22 21:30:05 +00:00
development	46943ba651	Update src/app/page.tsx	2026-01-22 21:30:01 +00:00
development	7d4ed063ed	Update src/app/layout.tsx	2026-01-22 21:30:00 +00:00
development	9d91a467f0	Update src/app/blog/page.tsx	2026-01-22 21:29:59 +00:00
development	293d939914	Merge version_2 into main Merge version_2 into main	2026-01-22 21:26:58 +00:00