7 Commits

Author SHA1 Message Date
3afcaa67b4 Update src/app/styles/variables.css 2026-02-27 04:57:55 +00:00
097e87b170 Merge version_2 into main
Merge version_2 into main
2026-02-27 04:54:05 +00:00
e46cff49fe Update src/app/shop/page.tsx 2026-02-27 04:54:01 +00:00
ac6dbb7549 Update src/app/shop/[id]/page.tsx 2026-02-27 04:54:00 +00:00
cb64f8b90c Update src/app/page.tsx 2026-02-27 04:53:59 +00:00
86faa82d10 Update src/app/layout.tsx 2026-02-27 04:53:58 +00:00
ae8efd13aa Update src/app/blog/page.tsx 2026-02-27 04:53:57 +00:00
6 changed files with 25 additions and 30 deletions

View File

@@ -17,7 +17,7 @@ export default function BlogPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

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

View File

@@ -21,7 +21,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -309,4 +309,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -82,7 +82,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -97,8 +97,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -151,7 +150,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -166,8 +165,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -227,7 +225,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -242,8 +240,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -319,4 +316,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -25,7 +25,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -40,8 +40,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -93,7 +92,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -108,8 +107,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -168,4 +166,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

@@ -3,22 +3,22 @@
/* --vw is set by ThemeProvider */
/* --background: #ffffff;;
--card: #f5f5f5;;
--card: #f9f9f9;;
--foreground: #000000;;
--primary-cta: #000000;;
--primary-cta: #2d5016;;
--secondary-cta: #f9f9f9;;
--accent: #e6e6e6;;
--background-accent: #d0d0d0;; */
--accent: #52b34f;;
--background-accent: #a8e8ba;; */
--background: #ffffff;;
--card: #f5f5f5;;
--card: #f9f9f9;;
--foreground: #000000;;
--primary-cta: #000000;;
--primary-cta: #2d5016;;
--primary-cta-text: #ffffff;;
--secondary-cta: #f9f9f9;;
--secondary-cta-text: #000000;;
--accent: #e6e6e6;;
--background-accent: #d0d0d0;;
--accent: #52b34f;;
--background-accent: #a8e8ba;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);