Merge version_2 into main #2

Merged
bender merged 6 commits from version_2 into main 2026-02-18 14:53:12 +00:00
6 changed files with 20 additions and 20 deletions

View File

@@ -95,4 +95,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

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

View File

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

View File

@@ -242,4 +242,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -113,4 +113,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #efebe5;;
--card: #f7f2ea;;
--foreground: #000000;;
--primary-cta: #000000;;
--secondary-cta: #ffffff;;
--accent: #ffffff;;
--background-accent: #e1b875;; */
/* --background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;; */
--background: #efebe5;;
--card: #f7f2ea;;
--foreground: #000000;;
--primary-cta: #000000;;
--secondary-cta: #ffffff;;
--accent: #ffffff;;
--background-accent: #e1b875;;
--background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);