Merge version_2 into main #2

Merged
development merged 5 commits from version_2 into main 2026-01-29 13:30:39 +00:00
5 changed files with 18 additions and 18 deletions

View File

@@ -128,4 +128,4 @@ export default function AboutPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

View File

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

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #fcf6ec;; /* --background: #010912;;
--card: #f3ede2;; --card: #152840;;
--foreground: #2e2521;; --foreground: #e6f0ff;;
--primary-cta: #2e2521;; --primary-cta: #cee7ff;;
--secondary-cta: #ffffff;; --secondary-cta: #0e1a29;;
--accent: #b2a28b;; --accent: #3f5c79;;
--background-accent: #b2a28b;; */ --background-accent: #004a93;; */
--background: #fcf6ec;; --background: #010912;;
--card: #f3ede2;; --card: #152840;;
--foreground: #2e2521;; --foreground: #e6f0ff;;
--primary-cta: #2e2521;; --primary-cta: #cee7ff;;
--secondary-cta: #ffffff;; --secondary-cta: #0e1a29;;
--accent: #b2a28b;; --accent: #3f5c79;;
--background-accent: #b2a28b;; --background-accent: #004a93;;
/* 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

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

View File

@@ -315,4 +315,4 @@ export default function HomePage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }