Merge version_10 into main

Update theme fonts
2026-05-30 19:17:47 +00:00 · 2026-05-30 19:17:41 +00:00 · 2026-05-30 19:17:41 +00:00 · 2026-05-30 19:17:38 +00:00 · 2026-05-30 19:17:35 +00:00 · 2026-05-30 19:17:35 +00:00
3 changed files with 20 additions and 17 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,23 +6,28 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Inter_Tight } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";

-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});

 export const metadata: Metadata = {
  title: 'Barber Chop VIP: Elite Grooming & Styling',
  description: 'Indulge in the ultimate grooming experience at Barber Chop VIP. Discover sophisticated styles, premium services, and an exclusive atmosphere designed for the modern gentleman.',
 };

+
+
+const libreBaskerville = Libre_Baskerville({
+  variable: "--font-libre-baskerville",
+  subsets: ["latin"],
+  weight: ["400", "700"],
+});
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
  children,
 }: Readonly<{
@@ -31,9 +36,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} antialiased`}
-        >
+        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-inter-tight), sans-serif;
+  font-family: var(--font-inter), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-inter-tight), sans-serif;
+  font-family: var(--font-libre-baskerville), serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #080000;
+  --background: #cbb7b7;
  --card: #1e0d0d;
  --foreground: #ffe6e6;
  --primary-cta: #ff7a7a;
  --primary-cta-text: #000000;
  --secondary-cta: #661313;
  --secondary-cta-text: #ffe6e6;
-  --accent: #7b4242;
-  --background-accent: #65292c;
+  --accent: #ffcf00;
+  --background-accent: #824245;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	44d8687ae6	Merge version_10 into main Merge version_10 into main	2026-05-30 19:17:47 +00:00
bender	1315c17fbf	Update theme fonts	2026-05-30 19:17:41 +00:00
bender	a0a3086010	Update theme fonts	2026-05-30 19:17:41 +00:00
bender	c938e68f79	Merge version_10 into main Merge version_10 into main	2026-05-30 19:17:38 +00:00
bender	93cc07767c	Update theme fonts	2026-05-30 19:17:35 +00:00
bender	c01ee19744	Update theme fonts	2026-05-30 19:17:35 +00:00
bender	3b245511a7	Merge version_10 into main Merge version_10 into main	2026-05-30 19:17:23 +00:00
bender	e0b466c0bf	Update theme fonts	2026-05-30 19:17:20 +00:00
bender	0ef4809034	Update theme fonts	2026-05-30 19:17:19 +00:00
bender	e4f0fe2840	Merge version_10 into main Merge version_10 into main	2026-05-30 19:16:55 +00:00
bender	8f3cd73020	Update theme colors	2026-05-30 19:16:52 +00:00
bender	365e388455	Merge version_9 into main Merge version_9 into main	2026-05-30 19:16:15 +00:00
bender	6a6a5d0abc	Update theme colors	2026-05-30 19:16:12 +00:00
bender	e66b0f0f28	Merge version_8 into main Merge version_8 into main	2026-05-30 19:15:52 +00:00
bender	641827ea18	Update theme colors	2026-05-30 19:15:49 +00:00
bender	60537711fc	Merge version_7 into main Merge version_7 into main	2026-05-30 19:15:31 +00:00
bender	f4dd3f25b3	Merge version_6 into main Merge version_6 into main	2026-05-30 19:15:21 +00:00
bender	0fead8d934	Merge version_5 into main Merge version_5 into main	2026-05-30 19:15:03 +00:00
bender	2345f63a2f	Merge version_4 into main Merge version_4 into main	2026-05-30 18:35:44 +00:00
bender	4efa7c1013	Merge version_3 into main Merge version_3 into main	2026-05-30 18:35:32 +00:00
bender	7d78da2290	Merge version_2 into main Merge version_2 into main	2026-05-30 17:26:19 +00:00
bender	b97bf7d4c6	Merge version_2 into main Merge version_2 into main	2026-05-30 17:25:30 +00:00