Merge version_4 into main #6

Merged
bender merged 6 commits from version_4 into main 2026-02-24 11:47:19 +00:00
6 changed files with 24 additions and 24 deletions

View File

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

View File

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

View File

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

View File

@@ -88,7 +88,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
@@ -135,7 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
@@ -189,7 +189,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
@@ -252,4 +252,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -33,7 +33,7 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
@@ -79,7 +79,7 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
@@ -125,4 +125,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

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