Merge version_2 into main #5

Merged
bender merged 2 commits from version_2 into main 2026-03-26 19:22:55 +00:00
2 changed files with 4 additions and 2 deletions

View File

@@ -8,7 +8,7 @@ import ProductDetailCard from '@/components/ecommerce/productDetail/ProductDetai
export default function MonsteraPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
@@ -17,6 +17,7 @@ export default function MonsteraPage() {
{ name: "Petunias", id: "/product/petunias" },
]}
brandName="Floridea"
button={{ text: "Cart", href: "/cart" }}
/>
<div className="pt-32 pb-20">
<ProductDetailCard

View File

@@ -8,7 +8,7 @@ import ProductDetailCard from '@/components/ecommerce/productDetail/ProductDetai
export default function PetuniasPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
@@ -17,6 +17,7 @@ export default function PetuniasPage() {
{ name: "Petunias", id: "/product/petunias" },
]}
brandName="Floridea"
button={{ text: "Cart", href: "/cart" }}
/>
<div className="pt-32 pb-20">
<ProductDetailCard