Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-02 08:04:49 +00:00
3 changed files with 17 additions and 17 deletions

View File

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

View File

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

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #ecebea;;
--accent: #ffffff;;
--background-accent: #c6b180;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--primary-cta-text: #f5f4ef;;
--secondary-cta: #ecebea;;
--secondary-cta: #1a1a1a;;
--secondary-cta-text: #2a2928;;
--accent: #ffffff;;
--background-accent: #c6b180;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);