Merge version_6 into main #8

Merged
bender merged 6 commits from version_6 into main 2026-02-24 11:53:14 +00:00
6 changed files with 21 additions and 21 deletions

View File

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

View File

@@ -1410,4 +1410,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

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

View File

@@ -252,4 +252,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -125,4 +125,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;; */
/* --background: #e8d4c4;;
--card: #f5e6d9;;
--foreground: #3d2817;;
--primary-cta: #8b4513;;
--secondary-cta: #f5e6d9;;
--accent: #d4a373;;
--background-accent: #b8925f;; */
--background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #0e1a29;;
--secondary-cta-text: #0c1325;;
--accent: #3f5c79;;
--background-accent: #004a93;;
--background: #e8d4c4;;
--card: #f5e6d9;;
--foreground: #3d2817;;
--primary-cta: #8b4513;;
--primary-cta-text: #ffffff;;
--secondary-cta: #f5e6d9;;
--secondary-cta-text: #3d2817;;
--accent: #d4a373;;
--background-accent: #b8925f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);