Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2026-01-20 12:27:08 +00:00
3 changed files with 16 additions and 16 deletions

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #e3deea;; /* --background: #0a0a0a;;
--card: #ffffff;; --card: #1a1a1a;;
--foreground: #27231f;; --foreground: #ffe6e6;;
--primary-cta: #27231f;; --primary-cta: #ff3d4a;;
--secondary-cta: #ffffff;; --secondary-cta: #1f0a0a;;
--accent: #c68a62;; --accent: #7b2d2d;;
--background-accent: #c68a62;; */ --background-accent: #b8111f;; */
--background: #e3deea;; --background: #0a0a0a;;
--card: #ffffff;; --card: #1a1a1a;;
--foreground: #27231f;; --foreground: #ffe6e6;;
--primary-cta: #27231f;; --primary-cta: #ff3d4a;;
--secondary-cta: #ffffff;; --secondary-cta: #1f0a0a;;
--accent: #c68a62;; --accent: #7b2d2d;;
--background-accent: #c68a62;; --background-accent: #b8111f;;
/* 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

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

View File

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