bender/145d8dab-252f-40c3-9e79-0db590f69bb4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 3 commits from version_2 into main 2026-02-21 19:47:59 +00:00
Conversation 0 Commits 3 Files Changed 3 +21 -26
3 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/shop/[id]/page.tsx
View File

@@ -94,8 +94,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay
brandName="Ristorante Milanese"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 lg:px-12"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}n className="py-4 px-6 lg:px-12"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-semibold"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -136,8 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay
brandName="Ristorante Milanese"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 lg:px-12"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}n className="py-4 px-6 lg:px-12"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-semibold"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -185,8 +183,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay
brandName="Ristorante Milanese"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 lg:px-12"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}n className="py-4 px-6 lg:px-12"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-semibold"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}

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

@@ -62,8 +62,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay
brandName="Ristorante Milanese"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 lg:px-12"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}n className="py-4 px-6 lg:px-12"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-semibold"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -103,8 +102,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay
brandName="Ristorante Milanese"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 lg:px-12"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}n className="py-4 px-6 lg:px-12"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-semibold"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0b07ff;;
--secondary-cta: #ffffff;;
--accent: #93b7ff;;
--background-accent: #a8bae8;; */
/* --background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #ecebea;;
--accent: #ffffff;;
--background-accent: #c6b180;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0b07ff;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #0c1325;;
--accent: #93b7ff;;
--background-accent: #a8bae8;;
--background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--primary-cta-text: #f5f4ef;;
--secondary-cta: #ecebea;;
--secondary-cta-text: #2a2928;;
--accent: #ffffff;;
--background-accent: #c6b180;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);