bender/7b25ee85-4a6e-4799-939d-b0047c2144c4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-16 15:24:38 +00:00
Conversation 0 Commits 4 Files Changed 4 +16 -8
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ export default function BlogPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"

6
src/app/page.tsx
View File

@@ -20,7 +20,7 @@ export default function BeachPerfumePage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
@@ -53,7 +53,7 @@ export default function BeachPerfumePage() {
{ text: "Learn More", href: "#about" }
]}
buttonAnimation="slide-up"
background={{ variant: "grid" }}
background={{ variant: "plain" }}
carouselItems={[
{
id: "carousel-1", imageSrc: "https://img.b2bpic.net/free-photo/top-view-skincare-product-beach_23-2150167921.jpg", imageAlt: "Ocean Breeze Perfume"
@@ -124,6 +124,7 @@ export default function BeachPerfumePage() {
label: "Awards Won", value: "8"
}
]}
metricsAnimation="slide-up"
useInvertedBackground={true}
/>
</div>
@@ -190,6 +191,7 @@ export default function BeachPerfumePage() {
id: "2", value: "8hrs+", description: "Long-lasting fragrance performance that stays with you all day"
}
]}
metricsAnimation="slide-up"
useInvertedBackground={true}
/>
</div>

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

@@ -74,7 +74,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
@@ -118,7 +118,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
@@ -169,7 +169,7 @@ export default function ProductPage({ params }: ProductPageProps) {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"

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

@@ -24,7 +24,7 @@ export default function ShopPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
@@ -42,6 +42,9 @@ export default function ShopPage() {
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
]}
button={{
text: "Cart", href: "#cart"
}}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -66,7 +69,7 @@ export default function ShopPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
@@ -84,6 +87,9 @@ export default function ShopPage() {
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
]}
button={{
text: "Cart", href: "#cart"
}}
/>
</div>
<div id="productCatalog" data-section="productCatalog">