Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
2025-12-19 22:16:37 +00:00
3 changed files with 12 additions and 12 deletions

View File

@@ -4,13 +4,13 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #f7fafd;; --background: #ffffff;
--card: #eff6fc;; --card: #fcfcfc;
--foreground: #1a2433;; --foreground: #000000e6;
--primary-cta: #2563eb;; --primary-cta: #ec407a;
--secondary-cta: #ffffff;; --secondary-cta: #ffffff;
--accent: #fb923c;; --accent: #f48fb1;
--background-accent: #f97316;; --background-accent: #f06292;
/* 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);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-fraunces), sans-serif; font-family: var(--font-inter-tight), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-fraunces), sans-serif; font-family: var(--font-inter-tight), sans-serif;
} }

View File

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

View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="soft" borderRadius="soft"
contentWidth="small" contentWidth="small"
sizing="medium" sizing="medium"
background="none" background="shadow-colored"
cardStyle="inset" cardStyle="inset"
primaryButtonStyle="layered-depth" primaryButtonStyle="layered-depth"
secondaryButtonStyle="radial-glow" secondaryButtonStyle="radial-glow"