Merge version_2 into main

Merge version_2 into main

src/app/about/page.tsx

@@ -134,4 +134,4 @@ export default function AboutPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/blog/page.tsx

@@ -30,10 +30,10 @@ export default function BlogPage() {
                         brandName="Construction Property LA"
                         navItems={[
                             { name: "Home", id: "/" },
-                            { name: "Services", id: "services" },
-                            { name: "Portfolio", id: "portfolio" },
-                            { name: "About", id: "about" },
-                            { name: "Contact", id: "contact" }
+                            { name: "Services", id: "/services" },
+                            { name: "Portfolio", id: "/portfolio" },
+                            { name: "About", id: "/about" },
+                            { name: "Contact", id: "/contact" }
                         ]}
                         bottomLeftText="Los Angeles, CA"
                         bottomRightText="hello@constructionpropertyLA.com"
@@ -84,4 +84,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/contact/page.tsx

@@ -106,4 +106,4 @@ export default function ContactPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/layout.tsx

@@ -1332,4 +1332,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -253,4 +253,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/services/page.tsx

@@ -154,4 +154,4 @@ export default function ServicesPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/shop/[id]/page.tsx

@@ -218,4 +218,4 @@ export default function ProductPage({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -106,4 +106,4 @@ export default function ShopPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/styles/variables.css

@@ -2,21 +2,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f5f4ef;;
-  --card: #dad6cd;;
-  --foreground: #2a2928;;
-  --primary-cta: #2a2928;;
-  --secondary-cta: #efe7dd;;
-  --accent: #ffffff;;
-  --background-accent: #c6b180;; */
+  /* --background: #f5f5f5;;
+  --card: #ffffff;;
+  --foreground: #1c1c1c;;
+  --primary-cta: #1c1c1c;;
+  --secondary-cta: #ffffff;;
+  --accent: #15479c;;
+  --background-accent: #a8cce8;; */
 
-  --background: #f5f4ef;;
-  --card: #dad6cd;;
-  --foreground: #2a2928;;
-  --primary-cta: #2a2928;;
-  --secondary-cta: #efe7dd;;
-  --accent: #ffffff;;
-  --background-accent: #c6b180;;
+  --background: #f5f5f5;;
+  --card: #ffffff;;
+  --foreground: #1c1c1c;;
+  --primary-cta: #1c1c1c;;
+  --secondary-cta: #ffffff;;
+  --accent: #15479c;;
+  --background-accent: #a8cce8;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);