Merge version_3 into main

Update src/app/page.tsx
2026-03-04 05:38:59 +00:00 · 2026-03-04 05:38:55 +00:00 · 2026-03-04 05:37:38 +00:00 · 2026-03-04 05:37:34 +00:00 · 2026-03-04 05:37:33 +00:00 · 2026-03-04 05:37:33 +00:00
4 changed files with 158 additions and 48 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,22 +1,17 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
-import { Public_Sans } from "next/font/google";
+import { Poppins } from "next/font/google";
+import { DM_Sans } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";

-const halant = Halant({
-  variable: "--font-halant",  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
+const poppins = Poppins({
+  variable: "--font-poppins",  subsets: ["latin"],
+  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
 });

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

 export const metadata: Metadata = {
@@ -50,7 +45,7 @@ export default function RootLayout({
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
        <body
-          className={`${halant.variable} ${inter.variable} ${publicSans.variable} antialiased`}
+          className={`${poppins.variable} ${dmSans.variable} antialiased`}
        >
          <Tag />
          {children}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -5,25 +5,26 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
 import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
+import FeatureCardTwelve from '@/components/sections/feature/FeatureCardTwelve';
 import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
 import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
-import { Info, Sparkles } from 'lucide-react';
+import { Info, Sparkles, Shirt, Cloud } from 'lucide-react';

 export default function LandingPage() {
  return (
    <ThemeProvider
      defaultButtonVariant="shift-hover"
      defaultTextAnimation="reveal-blur"
-      borderRadius="pill"
+      borderRadius="rounded"
      contentWidth="mediumLarge"
      sizing="largeSmallSizeLargeTitles"
-      background="none"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="radial-glow"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="normal"
+      background="circleGradient"
+      cardStyle="glass-elevated"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="semibold"
    >
      <div id="nav" data-section="nav">
        <NavbarStyleApple
@@ -41,9 +42,9 @@ export default function LandingPage() {
        <HeroLogoBillboardSplit
          logoText="MARTH CLOTHS"
          description="Premium unstitched Pakistani fabrics from Faisalabad. Discover our exclusive collection of high-quality cotton, linen, silk, and lawn textiles crafted with traditional excellence and modern standards."
-          background={{ variant: "plain" }}
+          background={{ variant: "glowing-orb" }}
          buttons={[
-            { text: "Shop Now", href: "#products" },
+            { text: "Browse Fabrics", href: "#products" },
            { text: "Learn More", href: "#about" }
          ]}
          layoutOrder="default"
@@ -94,7 +95,7 @@ export default function LandingPage() {
              id: "3",              name: "Luxe Silk Fabric",              price: "PKR 2000 - 3500/yard",              imageSrc: "http://img.b2bpic.net/free-photo/elegant-silk-fabric-decoration_23-2148516034.jpg?_wi=1",              imageAlt: "Premium silk textile"
            },
            {
-              id: "4",              name: "Printed Lawn",              price: "PKR 600 - 1000/yard",              imageSrc: "http://img.b2bpic.net/free-vector/pretty-tropical-floral-pattern_23-2148808877.jpg",              imageAlt: "Colorful printed lawn fabric"
+              id: "4",              name: "Printed Lawn",              price: "PKR 600 - 1000/yard",              imageSrc: "http://img.b2bpic.net/free-photo/pretty-tropical-floral-pattern_23-2148808877.jpg",              imageAlt: "Colorful printed lawn fabric"
            }
          ]}
          gridVariant="three-columns-all-equal-width"
@@ -106,6 +107,126 @@ export default function LandingPage() {
        />
      </div>

+      <div id="men-collection" data-section="men-collection">
+        <FeatureCardTwelve
+          title="Men's Fabric Collections"
+          description="Premium fabrics designed specifically for men's fashion and traditional wear."
+          tag="Men's Category"
+          tagIcon={Shirt}
+          tagAnimation="opacity"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+          features={[
+            {
+              id: "mens-formal",              label: "Formal",              title: "Executive Formal Wear",              items: [
+                "Premium cotton blends",                "Fine weave patterns",                "Business professional colors",                "Durable and easy care"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            },
+            {
+              id: "mens-casual",              label: "Casual",              title: "Comfort Casual Fabrics",              items: [
+                "Breathable cotton",                "Relaxed fit materials",                "Modern color palettes",                "Perfect for everyday wear"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            },
+            {
+              id: "mens-traditional",              label: "Traditional",              title: "Classic South Asian Style",              items: [
+                "Authentic shalwar kameez fabrics",                "Premium lawn collections",                "Traditional embroidery patterns",                "Specialty weaves and finishes"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            }
+          ]}
+        />
+      </div>
+
+      <div id="women-collection" data-section="women-collection">
+        <FeatureCardTwelve
+          title="Women's Fabric Collections"
+          description="Elegant and versatile fabrics for women's modern and traditional fashion."
+          tag="Women's Category"
+          tagIcon={Sparkles}
+          tagAnimation="opacity"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+          features={[
+            {
+              id: "womens-formal",              label: "Formal",              title: "Sophisticated Formal Wear",              items: [
+                "Elegant silk blends",                "Fine embroidered designs",                "Rich color variations",                "Premium finishing details"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            },
+            {
+              id: "womens-casual",              label: "Casual",              title: "Everyday Comfort Fabrics",              items: [
+                "Soft cotton basics",                "Printed lawn designs",                "Vibrant color collections",                "Easy to style and wear"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            },
+            {
+              id: "womens-traditional",              label: "Traditional",              title: "Timeless Cultural Fashion",              items: [
+                "Premium lawn dupatta collections",                "Ornate embroidery fabrics",                "Silk unstitched pieces",                "Heritage pattern designs"
+              ],              buttons: [{ text: "Explore", href: "#products" }]
+            }
+          ]}
+        />
+      </div>
+
+      <div id="summer-collection" data-section="summer-collection">
+        <FeatureCardTwelve
+          title="Summer Collections"
+          description="Light, breathable fabrics perfect for warm weather and season styling."
+          tag="Summer Range"
+          tagIcon={Cloud}
+          tagAnimation="opacity"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+          features={[
+            {
+              id: "summer-cotton",              label: "Cotton",              title: "Breathable Cotton Selection",              items: [
+                "Ultra-light weight",                "Maximum breathability",                "Quick-dry properties",                "Perfect for hot climates"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            },
+            {
+              id: "summer-lawn",              label: "Lawn",              title: "Vibrant Lawn Fabrics",              items: [
+                "Crisp and cool texture",                "Colorful prints available",                "Ideal for summer outfits",                "Comfortable all-day wear"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            },
+            {
+              id: "summer-linen",              label: "Linen",              title: "Premium Summer Linen",              items: [
+                "Natural cooling effect",                "Elegant and sophisticated",                "Durable and long-lasting",                "Perfect for summer elegance"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            }
+          ]}
+        />
+      </div>
+
+      <div id="winter-collection" data-section="winter-collection">
+        <FeatureCardTwelve
+          title="Winter Collections"
+          description="Warm and luxurious fabrics designed for comfort and style in cooler seasons."
+          tag="Winter Range"
+          tagIcon={Cloud}
+          tagAnimation="opacity"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+          features={[
+            {
+              id: "winter-wool",              label: "Wool",              title: "Premium Wool Blends",              items: [
+                "Exceptional warmth",                "Soft and comfortable",                "Durable for multiple seasons",                "Classic color options"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            },
+            {
+              id: "winter-silk",              label: "Silk",              title: "Luxurious Winter Silk",              items: [
+                "Elegant and sophisticated",                "Naturally insulating",                "Premium sheen and texture",                "Perfect for special occasions"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            },
+            {
+              id: "winter-velvet",              label: "Velvet",              title: "Luxe Velvet Collection",              items: [
+                "Ultra-soft touch",                "Rich deep colors",                "Premium draping",                "Ideal for formal winter wear"
+              ],              buttons: [{ text: "Shop Now", href: "#products" }]
+            }
+          ]}
+        />
+      </div>
+
      <div id="pricing" data-section="pricing">
        <PricingCardNine
          title="Bulk Order Pricing"
@@ -118,23 +239,17 @@ export default function LandingPage() {
            {
              id: "retail",              title: "Retail Order",              price: "Standard Rate",              period: "per yard",              features: [
                "Minimum 5 yards",                "Standard shipping",                "Quality guarantee",                "Multiple fabric options"
-              ],
-              button: { text: "Order Now", href: "#contact" },
-              imageSrc: "http://img.b2bpic.net/free-photo/natural-white-cotton-crumpled-soft-fabric-texture-background-surface_640221-220.jpg?_wi=2"
+              ],              button: { text: "Order Now", href: "#contact" },              imageSrc: "http://img.b2bpic.net/free-photo/natural-white-cotton-crumpled-soft-fabric-texture-background-surface_640221-220.jpg?_wi=2"
            },
            {
              id: "wholesale",              title: "Wholesale",              price: "15% Off",              period: "100+ yards",              features: [
                "Minimum 100 yards",                "Bulk discounts",                "Free shipping",                "Dedicated support"
-              ],
-              button: { text: "Get Quote", href: "#contact" },
-              imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-monochromatic-colored-cloths_23-2148770292.jpg?_wi=2"
+              ],              button: { text: "Get Quote", href: "#contact" },              imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-monochromatic-colored-cloths_23-2148770292.jpg?_wi=2"
            },
            {
              id: "corporate",              title: "Corporate Bulk",              price: "25% Off",              period: "500+ yards",              features: [
                "Minimum 500 yards",                "Maximum discount",                "Custom packaging",                "Priority handling"
-              ],
-              button: { text: "Contact Sales", href: "#contact" },
-              imageSrc: "http://img.b2bpic.net/free-photo/elegant-silk-fabric-decoration_23-2148516034.jpg?_wi=2"
+              ],              button: { text: "Contact Sales", href: "#contact" },              imageSrc: "http://img.b2bpic.net/free-photo/elegant-silk-fabric-decoration_23-2148516034.jpg?_wi=2"
            }
          ]}
        />
--- 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-poppins), 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-dm-sans), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -2,23 +2,23 @@
  /* Base units */
  /* --vw is set by ThemeProvider */

-  /* --background: #f5f4ef;;
-  --card: #dad6cd;;
-  --foreground: #2a2928;;
-  --primary-cta: #2a2928;;
-  --secondary-cta: #ecebea;;
-  --accent: #ffffff;;
-  --background-accent: #c6b180;; */
+  /* --background: #f7f6f7;;
+  --card: #ffffff;;
+  --foreground: #0c1325;;
+  --primary-cta: #0798ff;;
+  --secondary-cta: #ffffff;;
+  --accent: #93c7ff;;
+  --background-accent: #a8cde8;; */

-  --background: #f5f4ef;;
-  --card: #dad6cd;;
-  --foreground: #2a2928;;
-  --primary-cta: #2a2928;;
+  --background: #f7f6f7;;
+  --card: #ffffff;;
+  --foreground: #0c1325;;
+  --primary-cta: #0798ff;;
  --primary-cta-text: #f5f4ef;;
-  --secondary-cta: #ecebea;;
+  --secondary-cta: #ffffff;;
  --secondary-cta-text: #2a2928;;
-  --accent: #ffffff;;
-  --background-accent: #c6b180;;
+  --accent: #93c7ff;;
+  --background-accent: #a8cde8;;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	4556d43ae2	Merge version_3 into main Merge version_3 into main	2026-03-04 05:38:59 +00:00
bender	95d1c9ef18	Update src/app/page.tsx	2026-03-04 05:38:55 +00:00
bender	3a8884475d	Merge version_3 into main Merge version_3 into main	2026-03-04 05:37:38 +00:00
bender	ffe784f17e	Update src/app/styles/variables.css	2026-03-04 05:37:34 +00:00
bender	6f50986847	Update src/app/styles/base.css	2026-03-04 05:37:33 +00:00
bender	e347c392f1	Update src/app/page.tsx	2026-03-04 05:37:33 +00:00
bender	fcb27798fa	Update src/app/layout.tsx	2026-03-04 05:37:32 +00:00
bender	6c73a4100a	Merge version_2 into main Merge version_2 into main	2026-03-04 05:34:31 +00:00
bender	91755da22d	Update src/app/page.tsx	2026-03-04 05:34:27 +00:00
bender	45104533d7	Merge version_1 into main Merge version_1 into main	2026-03-04 05:32:10 +00:00