Merge version_3 into main #2

Merged
development merged 3 commits from version_3 into main 2026-01-13 13:19:21 +00:00
3 changed files with 17 additions and 17 deletions

View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #ecebea;;
--accent: #ffffff;;
--background-accent: #ffffff;; */
/* --background: #1a1a1a;;
--card: #000000;;
--foreground: #ffffff;;
--primary-cta: #ff0000;;
--secondary-cta: #1a1a1a;;
--accent: #ff0000;;
--background-accent: #330000;; */
--background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #ecebea;;
--accent: #ffffff;;
--background-accent: #ffffff;;
--background: #1a1a1a;;
--card: #000000;;
--foreground: #ffffff;;
--primary-cta: #ff0000;;
--secondary-cta: #1a1a1a;;
--accent: #ff0000;;
--background-accent: #330000;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

View File

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

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
@@ -301,4 +301,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}