Merge version_2 into main #6

Merged
bender merged 4 commits from version_2 into main 2026-04-28 10:44:08 +00:00
4 changed files with 8 additions and 10 deletions

View File

@@ -2,7 +2,6 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -58,4 +57,4 @@ export default function AboutPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

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

View File

@@ -5,7 +5,6 @@ import ReactLenis from "lenis/react";
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductCatalog from '@/components/ecommerce/productCatalog/ProductCatalog';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
export default function ShopPage() {
return (
@@ -55,4 +54,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #ffffff;
--background: #f7f6f7;
--card: #ffffff;
--foreground: #000000;
--primary-cta: #000000;
--foreground: #1b0c25;
--primary-cta: #1b0c25;
--primary-cta-text: #ffffff;
--secondary-cta: #ffffff;
--secondary-cta-text: #000000;
--accent: #e2e2e2;
--background-accent: #f5f5f5;
--accent: #ff93e4;
--background-accent: #e8a8c3;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);