Merge version_2 into main #2

Merged
bender merged 6 commits from version_2 into main 2026-02-25 00:19:30 +00:00
6 changed files with 24 additions and 29 deletions

View File

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

View File

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

View File

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

View File

@@ -97,8 +97,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -147,8 +146,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -204,8 +202,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -262,4 +259,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -40,8 +40,7 @@ function ShopPageContent() {
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -89,8 +88,7 @@ function ShopPageContent() {
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -130,4 +128,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--secondary-cta: #ffffff;;
--accent: #c68a62;;
--background-accent: #c68a62;; */
/* --background: #1a0d0d;;
--card: #2e1a1a;;
--foreground: #f4d9c7;;
--primary-cta: #c9a876;;
--secondary-cta: #2e1a1a;;
--accent: #d4a574;;
--background-accent: #8b6f47;; */
--background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--background: #1a0d0d;;
--card: #2e1a1a;;
--foreground: #f4d9c7;;
--primary-cta: #c9a876;;
--primary-cta-text: #e3deea;;
--secondary-cta: #ffffff;;
--secondary-cta: #2e1a1a;;
--secondary-cta-text: #27231f;;
--accent: #c68a62;;
--background-accent: #c68a62;;
--accent: #d4a574;;
--background-accent: #8b6f47;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);