Merge version_11 into main

Update src/app/page.tsx
2026-04-17 06:36:34 +00:00 · 2026-04-17 06:36:28 +00:00 · 2026-04-17 06:33:12 +00:00 · 2026-04-17 06:33:06 +00:00 · 2026-04-17 06:33:02 +00:00 · 2026-04-17 06:32:56 +00:00
3 changed files with 22 additions and 17 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,20 +6,27 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Nunito } from "next/font/google";
+import { Open_Sans } from "next/font/google";
+import { DM_Sans } from "next/font/google";
+import { Manrope } 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: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', openGraph: { title: 'Beshqozon Osh Markazi | The Heart of Real Uzbek Plov', description: 'Experience the authentic taste of Tashkent at Beshqozon. Premium slow-cooked Uzbek plov, rich flavors, and fast service in a warm, traditional atmosphere.', type: 'website' } };

+
+
+
+const manrope = Manrope({
+  variable: "--font-manrope",
+  subsets: ["latin"],
+});
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
  children,
 }: Readonly<{
@@ -28,9 +35,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} antialiased`}
-        >
+        <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,7 +3,7 @@
 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
-import HeroBillboard from "@/components/sections/hero/HeroBillboard";
+import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
 import TextAbout from "@/components/sections/about/TextAbout";
 import ProductCardOne from "@/components/sections/product/ProductCardOne";
 import MetricCardFourteen from "@/components/sections/metrics/MetricCardFourteen";
@@ -44,7 +44,7 @@ export default function BeshqozonPage() {
                </div>

                <div id="hero" data-section="hero">
-                    <HeroBillboard
+                    <HeroBillboardScroll
                        title="Tashkent’s Most Loved Plov Experience"
                        description="Rich flavor. Fast service. Authentic tradition. The heart of real Uzbek plov."
                        background={{ variant: "sparkles-gradient" }}
@@ -149,4 +149,4 @@ export default function BeshqozonPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- 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-dm-sans), 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-manrope), sans-serif;
 }
Author	SHA1	Message	Date
bender	821004bf8f	Merge version_11 into main Merge version_11 into main	2026-04-17 06:36:34 +00:00
bender	54bc3d77ba	Update src/app/page.tsx	2026-04-17 06:36:28 +00:00
bender	7192813602	Merge version_10 into main Merge version_10 into main	2026-04-17 06:33:12 +00:00
bender	0b7cd09013	Update theme colors	2026-04-17 06:33:06 +00:00
bender	c9fd668d36	Merge version_9 into main Merge version_9 into main	2026-04-17 06:33:02 +00:00
bender	8d101da3cb	Update theme colors	2026-04-17 06:32:56 +00:00
bender	8167d78179	Merge version_8 into main Merge version_8 into main	2026-04-16 17:00:49 +00:00
bender	5f6ff3212d	Update theme fonts	2026-04-16 17:00:49 +00:00
bender	1ef58487d5	Update theme fonts	2026-04-16 17:00:48 +00:00
bender	2dbd27280e	Update theme fonts	2026-04-16 17:00:46 +00:00
bender	8291606f7d	Update theme fonts	2026-04-16 17:00:46 +00:00
bender	64e7391889	Merge version_8 into main Merge version_8 into main	2026-04-16 17:00:41 +00:00
bender	72bbf12427	Update theme fonts	2026-04-16 17:00:38 +00:00
bender	de9dd977f5	Update theme fonts	2026-04-16 17:00:38 +00:00
bender	650fe9b314	Merge version_8 into main Merge version_8 into main	2026-04-16 17:00:32 +00:00
bender	ee7b7232d4	Update theme fonts	2026-04-16 17:00:29 +00:00
bender	bb0dbf3be5	Update theme fonts	2026-04-16 17:00:29 +00:00
bender	c4ab94251d	Merge version_8 into main Merge version_8 into main	2026-04-16 16:59:31 +00:00
bender	9351a40527	Update theme colors	2026-04-16 16:59:28 +00:00
bender	a20f0d258e	Merge version_7 into main Merge version_7 into main	2026-04-16 16:59:27 +00:00
bender	84de0d84a5	Update theme colors	2026-04-16 16:59:24 +00:00
bender	94b54f90b1	Merge version_6 into main Merge version_6 into main	2026-04-16 16:59:22 +00:00
bender	2786c25a67	Update theme colors	2026-04-16 16:59:19 +00:00
bender	ed8d51f3ef	Merge version_5 into main Merge version_5 into main	2026-04-16 16:59:17 +00:00
bender	c003263a38	Update theme colors	2026-04-16 16:59:14 +00:00
bender	cea132e725	Merge version_4 into main Merge version_4 into main	2026-04-16 16:59:11 +00:00
bender	61de95228f	Merge version_3 into main Merge version_3 into main	2026-04-16 16:59:02 +00:00
bender	6c860c0f10	Merge version_2 into main Merge version_2 into main	2026-04-16 16:58:53 +00:00