Merge version_15 into main

Update src/app/page.tsx
2026-05-14 21:30:05 +00:00 · 2026-05-14 21:29:59 +00:00 · 2026-05-14 21:29:38 +00:00 · 2026-05-14 21:29:35 +00:00 · 2026-05-14 21:29:06 +00:00 · 2026-05-14 21:29:03 +00:00
4 changed files with 42 additions and 45 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Public_Sans } from "next/font/google";
+import { Open_Sans } from "next/font/google";



@@ -19,7 +20,16 @@ export const metadata: Metadata = {
  },
 };

-const publicSans = Public_Sans({ variable: "--font-public-sans", subsets: ["latin"], });
+
+
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
+  subsets: ["latin"],
+});

 export default function RootLayout({
  children,
@@ -29,7 +39,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${publicSans.variable} antialiased`}>
+        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,7 +7,7 @@ import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureBento from '@/components/sections/feature/FeatureBento';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import HeroCentered from '@/components/sections/hero/HeroCentered';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
@@ -16,16 +16,16 @@ import { Award, CheckCircle, DollarSign, Globe, MapPin, Truck } from "lucide-rea
 export default function LandingPage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="text-shift"
-      defaultTextAnimation="reveal-blur"
-      borderRadius="soft"
-      contentWidth="mediumSmall"
-      sizing="mediumLargeSizeMediumTitles"
-      background="blurBottom"
-      cardStyle="gradient-mesh"
-      primaryButtonStyle="flat"
-      secondaryButtonStyle="solid"
-      headingFontWeight="bold"
+      defaultButtonVariant="text-stagger"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="medium"
+      background="circleGradient"
+      cardStyle="glass-elevated"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="normal"
    >
      <ReactLenis root>
        <div id="nav" data-section="nav">
@@ -41,35 +41,21 @@ export default function LandingPage() {
        </div>

        <div id="home" data-section="home">
-          <HeroCentered
+          <HeroSplit
            background={{ variant: "plain" }}
            title="Quality Staples for Your Business"
            description="Sam's Trading delivers premium rice, sugar, and cooking oil across Lebanon and Iraq. Trusted quality for every home and business."
-            avatars={[
-              { src: "http://img.b2bpic.net/free-photo/confident-successful-middle-aged-business-leader_1262-4872.jpg", alt: "Business Leader" },
-              { src: "http://img.b2bpic.net/free-photo/closeup-confident-asian-man-with-arms-crossed_1262-884.jpg", alt: "Business Partner" },
-              { src: "http://img.b2bpic.net/free-photo/businessman-smiling-camera_107420-95907.jpg", alt: "Manager" },
-              { src: "http://img.b2bpic.net/free-photo/multi-ethnic-team-business-trip_1098-15488.jpg", alt: "Team Member" },
-              { src: "http://img.b2bpic.net/free-photo/positive-business-partners-meeting-office-building-shaking-hands-with-each-other-side-view-medium-shot-corporate-communication-handshake-concept_74855-7728.jpg", alt: "Partner" }
-            ]}
            buttons={[
              { text: "Explore Products", href: "#products" },
              { text: "Contact Us", href: "#contact" }
            ]}
-            avatarText="Trusted by 500+ partners"
-            marqueeItems={[
-              { type: "text-icon", text: "Reliable Logistics", icon: Truck },
-              { type: "text-icon", text: "Bulk Pricing", icon: DollarSign },
-              { type: "text-icon", text: "Quality Assured", icon: CheckCircle },
-              { type: "text-icon", text: "Global Supply", icon: Globe },
-              { type: "text-icon", text: "Regional Experts", icon: MapPin }
-            ]}
+            imageSrc="http://img.b2bpic.net/free-photo/spoons-bag-with-rice_23-2147897533.jpg?_wi=1"
+            mediaAnimation="slide-up"
          />
        </div>

        <div id="about" data-section="about">
          <AboutMetric
-            useInvertedBackground={false}
            title="Serving Across Borders"
            metrics={[
              { icon: MapPin, label: "Regional Presence", value: "2 Countries" },
@@ -77,6 +63,7 @@ export default function LandingPage() {
              { icon: Award, label: "Customer Satisfaction", value: "99%" }
            ]}
            metricsAnimation="slide-up"
+            useInvertedBackground={false}
          />
        </div>

@@ -87,7 +74,7 @@ export default function LandingPage() {
            gridVariant="three-columns-all-equal-width"
            useInvertedBackground={false}
            products={[
-              { id: "p1", brand: "Sam's Selection", name: "Premium Basmati Rice", price: "$12.00", rating: 5, reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-photo/spoons-bag-with-rice_23-2147897533.jpg" },
+              { id: "p1", brand: "Sam's Selection", name: "Premium Basmati Rice", price: "$12.00", rating: 5, reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-photo/spoons-bag-with-rice_23-2147897533.jpg?_wi=2" },
              { id: "p2", brand: "Sam's Selection", name: "Pure White Sugar", price: "$8.00", rating: 5, reviewCount: "85", imageSrc: "http://img.b2bpic.net/free-photo/row-cookies-open-box_23-2147975215.jpg" },
              { id: "p3", brand: "Sam's Selection", name: "Sunflower Cooking Oil", price: "$15.00", rating: 4, reviewCount: "92", imageSrc: "http://img.b2bpic.net/free-photo/raw-yellow-brown-semolina-pasta-with-glass-bottle-oil_114579-38579.jpg" },
              { id: "p4", brand: "Sam's Selection", name: "Premium Jasmine Rice", price: "$14.00", rating: 5, reviewCount: "110", imageSrc: "http://img.b2bpic.net/free-photo/top-view-arrangement-with-different-organic-ingredients_23-2148685804.jpg" },
@@ -149,11 +136,11 @@ export default function LandingPage() {

        <div id="contact" data-section="contact">
          <ContactCenter
-            useInvertedBackground={false}
-            background={{ variant: "plain" }}
            tag="Get in touch"
            title="Need a Quote?"
            description="Reach out to Sam's Trading for bulk orders or partnership inquiries."
+            background={{ variant: "plain" }}
+            useInvertedBackground={false}
          />
        </div>

@@ -167,4 +154,4 @@ export default function LandingPage() {
      </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-public-sans), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-public-sans), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #bfbfbf;
-  --card: #550000;
-  --foreground: #ffffff;
-  --primary-cta: #15479c;
-  --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
-  --secondary-cta-text: #b5b5b5;
-  --accent: #e2e2e2;
-  --background-accent: #c4c4c4;
+  --background: #efebe5;
+  --card: #f7f2ea;
+  --foreground: #000000;
+  --primary-cta: #000000;
+  --primary-cta-text: #efebe5;
+  --secondary-cta: #ffffff;
+  --secondary-cta-text: #000000;
+  --accent: #ffffff;
+  --background-accent: #e1b875;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	161ed5d6bf	Merge version_15 into main Merge version_15 into main	2026-05-14 21:30:05 +00:00
bender	17ac6e455c	Update src/app/page.tsx	2026-05-14 21:29:59 +00:00
bender	3d0991c101	Merge version_15 into main Merge version_15 into main	2026-05-14 21:29:38 +00:00
bender	9312da7236	Update src/app/page.tsx	2026-05-14 21:29:35 +00:00
bender	0c7b5f8388	Merge version_15 into main Merge version_15 into main	2026-05-14 21:29:06 +00:00
bender	2ea969c075	Update src/app/page.tsx	2026-05-14 21:29:03 +00:00
bender	3b94ec575a	Merge version_15 into main Merge version_15 into main	2026-05-14 21:28:36 +00:00
bender	198b040bdc	Update src/app/page.tsx	2026-05-14 21:28:33 +00:00
bender	a283268b8c	Merge version_15 into main Merge version_15 into main	2026-05-14 21:28:07 +00:00
bender	d0146cae37	Update src/app/page.tsx	2026-05-14 21:28:03 +00:00
bender	c0a6f1725d	Merge version_15 into main Merge version_15 into main	2026-05-14 21:27:38 +00:00
bender	3a413b5e4b	Update src/app/page.tsx	2026-05-14 21:27:32 +00:00
bender	60cc3500b2	Switch to version 13: modified src/app/page.tsx	2026-05-14 21:26:52 +00:00
bender	e15b7742ea	Merge version_14 into main Merge version_14 into main	2026-05-14 21:25:52 +00:00
bender	73e98697f1	Update src/app/page.tsx	2026-05-14 21:25:49 +00:00
bender	39f8a1ac92	Merge version_13 into main Merge version_13 into main	2026-05-14 21:24:33 +00:00
bender	770b847829	Update theme fonts	2026-05-14 21:24:30 +00:00
bender	55e38a9240	Merge version_13 into main Merge version_13 into main	2026-05-14 21:24:29 +00:00
bender	5272db0950	Update theme fonts	2026-05-14 21:24:29 +00:00
bender	29beaf814d	Update theme fonts	2026-05-14 21:24:26 +00:00
bender	791991301d	Update theme fonts	2026-05-14 21:24:26 +00:00
bender	0f33bd34f9	Merge version_13 into main Merge version_13 into main	2026-05-14 21:24:10 +00:00
bender	a492ee67c6	Update theme colors	2026-05-14 21:24:07 +00:00
bender	f8cce33588	Merge version_12 into main Merge version_12 into main	2026-05-14 21:23:48 +00:00
bender	43c247ec89	Update theme colors	2026-05-14 21:23:45 +00:00
bender	cbf688cc83	Merge version_11 into main Merge version_11 into main	2026-05-14 21:23:44 +00:00
bender	4c954793fe	Merge version_10 into main Merge version_10 into main	2026-05-14 21:23:32 +00:00
bender	4906026c40	Merge version_9 into main Merge version_9 into main	2026-05-14 21:23:27 +00:00
bender	9d6c2606c6	Merge version_8 into main Merge version_8 into main	2026-05-14 21:23:05 +00:00
bender	1708108aca	Merge version_7 into main Merge version_7 into main	2026-05-14 21:22:51 +00:00
bender	2654709556	Merge version_6 into main Merge version_6 into main	2026-05-14 21:22:45 +00:00
bender	0cf78d0892	Merge version_5 into main Merge version_5 into main	2026-05-14 21:22:37 +00:00
bender	7ed3657bb8	Merge version_4 into main Merge version_4 into main	2026-05-14 21:22:24 +00:00
bender	ba4af93049	Merge version_3 into main Merge version_3 into main	2026-05-14 21:22:12 +00:00
bender	eb481bb71e	Merge version_2 into main Merge version_2 into main	2026-05-14 21:22:04 +00:00
bender	b881da1f61	Merge version_1 into main Merge version_1 into main	2026-05-14 21:13:37 +00:00
bender	228439dd65	Merge version_1 into main Merge version_1 into main	2026-05-14 21:09:20 +00:00
bender	a32b04f560	Merge version_1 into main Merge version_1 into main	2026-05-14 21:08:42 +00:00
bender	475ddd85ff	Merge version_1 into main Merge version_1 into main	2026-05-14 21:08:09 +00:00
bender	56bd61e982	Merge version_1 into main Merge version_1 into main	2026-05-14 21:07:38 +00:00
bender	2efe878a93	Merge version_1 into main Merge version_1 into main	2026-05-14 21:07:02 +00:00
bender	bcef38c279	Merge version_1 into main Merge version_1 into main	2026-05-14 21:06:41 +00:00