Merge version_4 into main #3

Merged
bender merged 5 commits from version_4 into main 2026-02-17 05:05:18 +00:00
5 changed files with 23 additions and 28 deletions

View File

@@ -109,4 +109,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -255,4 +255,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -89,8 +89,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"
@@ -140,8 +139,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"
@@ -198,8 +196,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"
@@ -257,4 +254,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -39,8 +39,7 @@ export default function ShopPage() {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{"text":"Book Now","href":"contact"}}
brandName="GlowUp Beauty Clinic"
@@ -89,8 +88,7 @@ export default function ShopPage() {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{"text":"Book Now","href":"contact"}}
brandName="GlowUp Beauty Clinic"
@@ -123,4 +121,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f9f3ed;;
--card: #faf5f0;;
--foreground: #3d2c24;;
--primary-cta: #d4a574;;
--secondary-cta: #f9f3ed;;
--accent: #f5d4b8;;
--background-accent: #f0c9b8;; */
/* --background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #ff1744;;
--secondary-cta: #ffffff;;
--accent: #f5c4c7;;
--background-accent: #f09199;; */
--background: #f9f3ed;;
--card: #faf5f0;;
--foreground: #3d2c24;;
--primary-cta: #d4a574;;
--secondary-cta: #f9f3ed;;
--accent: #f5d4b8;;
--background-accent: #f0c9b8;;
--background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #ff1744;;
--secondary-cta: #ffffff;;
--accent: #f5c4c7;;
--background-accent: #f09199;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);