Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
2026-02-15 09:53:03 +00:00
6 changed files with 20 additions and 20 deletions

View File

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

View File

@@ -1268,4 +1268,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';
@@ -241,4 +241,4 @@ export default function LuxuryHotelPage() {
</div>
</ThemeProvider>
);
}
}

View File

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

View File

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

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
--secondary-cta: #ffffff;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffaf5e6;;
--primary-cta: #ffaa70;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #15479c;;
--secondary-cta: #ffffff;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffaf5e6;;
--primary-cta: #ffaa70;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);