Merge version_2 into main #4

Merged
bender merged 4 commits from version_2 into main 2026-02-24 11:18:12 +00:00
4 changed files with 26 additions and 31 deletions

View File

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Testimonials", id: "testimonials" },
@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -92,12 +92,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -140,12 +139,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -195,12 +193,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

View File

@@ -37,12 +37,11 @@ function ShopPageContent() {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -84,12 +83,11 @@ function ShopPageContent() {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--secondary-cta: #ffffff;;
--accent: #93c7ff;;
--background-accent: #a8cde8;; */
/* --background: #000802;;
--card: #0b1a0b;;
--foreground: #e6ffe6;;
--primary-cta: #80da9b;;
--secondary-cta: #07170b;;
--accent: #38714a;;
--background-accent: #2c6541;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--background: #000802;;
--card: #0b1a0b;;
--foreground: #e6ffe6;;
--primary-cta: #80da9b;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta: #07170b;;
--secondary-cta-text: #0c1325;;
--accent: #93c7ff;;
--background-accent: #a8cde8;;
--accent: #38714a;;
--background-accent: #2c6541;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);