Merge version_2 into main #2

Merged
development merged 6 commits from version_2 into main 2026-01-22 22:38:01 +00:00
6 changed files with 17 additions and 17 deletions

View File

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

View File

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

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f5f5;; /* --background: #fafffb;;
--card: #ffffff;; --card: #f7fffa;;
--foreground: #1c1c1c;; --foreground: #001a0a;;
--primary-cta: #b82b40;; --primary-cta: #0a7039;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #b90941;; --accent: #a8d9be;;
--background-accent: #e8a8b6;; */ --background-accent: #6bbf8e;; */
--background: #f5f5f5;; --background: #fafffb;;
--card: #ffffff;; --card: #f7fffa;;
--foreground: #1c1c1c;; --foreground: #001a0a;;
--primary-cta: #b82b40;; --primary-cta: #0a7039;;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;;
--accent: #b90941;; --accent: #a8d9be;;
--background-accent: #e8a8b6;; --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

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

View File

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

View File

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