bender/47c777da-e083-493d-a3ca-610895819fa0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

9 Commits
version_1 ... main

Author SHA1 Message Date
bender
e537a09312 Merge version_2 into main 
Merge version_2 into main
 2026-02-20 13:18:58 +00:00
bender
807dcf8830 Update src/app/styles/variables.css 2026-02-20 13:18:54 +00:00
bender
d0eb9ee155 Update src/app/shop/page.tsx 2026-02-20 13:18:53 +00:00
bender
188ae7f163 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 13:08:39 +00:00
bender
1e760c3f67 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 13:08:00 +00:00
bender
37cc947244 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 13:05:49 +00:00
bender
d45fb81a71 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 13:03:45 +00:00
bender
3bac5084e2 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 13:01:33 +00:00
bender
7f2d8f0052 Merge version_1 into main 
Merge version_1 into main
 2026-02-20 12:59:07 +00:00
2 changed files with 15 additions and 15 deletions
Expand all files Collapse all files

2
src/app/shop/page.tsx
View File

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

28
src/app/styles/variables.css
View File

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