Merge version_2 into main #2

Merged
bender merged 6 commits from version_2 into main 2026-02-26 06:08:29 +00:00
6 changed files with 20 additions and 20 deletions

View File

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

View File

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

View File

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

View File

@@ -322,4 +322,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -170,4 +170,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #ffffff;;
--card: #f9f9f9;;
--foreground: #000612e6;;
--primary-cta: #15479c;;
--secondary-cta: #f9f9f9;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;; */
/* --background: #080000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #ffffff;;
--card: #f9f9f9;;
--foreground: #000612e6;;
--primary-cta: #15479c;;
--background: #080000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--primary-cta-text: #ffffff;;
--secondary-cta: #f9f9f9;;
--secondary-cta: #1f0a0a;;
--secondary-cta-text: #000612e6;;
--accent: #e2e2e2;;
--background-accent: #c4c4c4;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);