Merge version_4 into main #8

Merged
bender merged 2 commits from version_4 into main 2026-02-24 09:28:24 +00:00
2 changed files with 17 additions and 17 deletions

View File

@@ -44,7 +44,7 @@ function ShopPageContent() {
<NavbarLayoutFloatingInline
brandName="Nano Mango"
navItems={navItemsForSubPages}
button={{ text: "View Products", href: "/products" }}
button={{ text: "View Products", href: "/shop" }}
buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70"

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
/* --background: #fdfbf2;;
--card: #fefce8;;
--foreground: #2b2d21;;
--primary-cta: #4CAF50;;
--secondary-cta: #FFF176;;
--accent: #FFC107;;
--background-accent: #E8F5E9;; */
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--primary-cta-text: #060000;;
--secondary-cta: #1f0a0a;;
--secondary-cta-text: #ffe6e6;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
--background: #fdfbf2;;
--card: #fefce8;;
--foreground: #2b2d21;;
--primary-cta: #4CAF50;;
--primary-cta-text: #FFFFFF;;
--secondary-cta: #FFF176;;
--secondary-cta-text: #2b2d21;;
--accent: #FFC107;;
--background-accent: #E8F5E9;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);