Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-02-27 11:19:08 +00:00
3 changed files with 17 additions and 17 deletions

View File

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

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--secondary-cta: #ffffff;;
--accent: #e63946;;
--background-accent: #e8bea8;; */
/* --background: #080200;;
--card: #1a0d0b;;
--foreground: #ffe6d5;;
--primary-cta: #ffaa70;;
--secondary-cta: #170b07;;
--accent: #ffce93;;
--background-accent: #e8cfa8;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--background: #080200;;
--card: #1a0d0b;;
--foreground: #ffe6d5;;
--primary-cta: #ffaa70;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta: #170b07;;
--secondary-cta-text: #1c1c1c;;
--accent: #e63946;;
--background-accent: #e8bea8;;
--accent: #ffce93;;
--background-accent: #e8cfa8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);