Merge version_2 into main #7

Merged
bender merged 2 commits from version_2 into main 2026-02-20 13:18:58 +00:00
2 changed files with 15 additions and 15 deletions

View File

@@ -58,7 +58,7 @@ export default function ShopPage() {
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="PandaCoffee"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
/>
</div>
<div id="loading-state" data-section="loading-state">

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f6f0e9;;
--card: #efe7dd;;
--foreground: #2b180a;;
--primary-cta: #2b180a;;
--secondary-cta: #efe7dd;;
--accent: #94877c;;
--background-accent: #afa094;; */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #f6f0e9;;
--card: #efe7dd;;
--foreground: #2b180a;;
--primary-cta: #2b180a;;
--secondary-cta: #efe7dd;;
--accent: #94877c;;
--background-accent: #afa094;;
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);