Merge version_8 into main #7

Merged
development merged 4 commits from version_8 into main 2026-01-22 21:36:22 +00:00
4 changed files with 17 additions and 17 deletions

View File

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

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #060000;; /* --background: #fafffb;;
--card: #1d0d0d;; --card: #f7fffa;;
--foreground: #ffe6e6;; --foreground: #001a0a;;
--primary-cta: #ff3d4a;; --primary-cta: #0a7039;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--accent: #7b2d2d;; --accent: #a8d9be;;
--background-accent: #b8111f;; */ --background-accent: #6bbf8e;; */
--background: #060000;; --background: #fafffb;;
--card: #1d0d0d;; --card: #f7fffa;;
--foreground: #ffe6e6;; --foreground: #001a0a;;
--primary-cta: #ff3d4a;; --primary-cta: #0a7039;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--accent: #7b2d2d;; --accent: #a8d9be;;
--background-accent: #b8111f;; --background-accent: #6bbf8e;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

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

View File

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