development/22cf0418-65cc-4c2f-913e-c6f4f83f7c5b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 2 commits from version_2 into main 2026-01-17 17:13:14 +00:00
Conversation 0 Commits 2 Files Changed 2 +15 -13
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #faf8f5;;
--card: #f3ede5;;
--foreground: #3a3228;;
--primary-cta: #6b8e7e;;
/* --background: #f5ede5;;
--card: #efe7dd;;
--foreground: #4a3828;;
--primary-cta: #8b6f47;;
--secondary-cta: #ffffff;;
--accent: #a89888;;
--background-accent: #d4c4b0;; */
--accent: #c4a882;;
--background-accent: #d9c9b5;; */
--background: #faf8f5;;
--card: #f3ede5;;
--foreground: #3a3228;;
--primary-cta: #6b8e7e;;
--background: #f5ede5;;
--card: #efe7dd;;
--foreground: #4a3828;;
--primary-cta: #8b6f47;;
--secondary-cta: #ffffff;;
--accent: #a89888;;
--background-accent: #d4c4b0;;
--accent: #c4a882;;
--background-accent: #d9c9b5;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -71,6 +71,8 @@ export default function WellnessLoungePage() {
]}
autoPlay={true}
autoPlayInterval={4000}
containerClassName="w-full"
titleClassName="text-8xl md:text-9xl font-bold"
ariaLabel="Wellness Lounge hero section with spa imagery carousel"
/>
</div>