Merge version_2 into main

Update theme fonts
2026-05-17 11:14:24 +00:00 · 2026-05-17 11:14:21 +00:00 · 2026-05-17 11:14:21 +00:00 · 2026-05-17 11:11:56 +00:00 · 2026-05-17 11:11:53 +00:00 · 2026-05-17 11:11:52 +00:00
4 changed files with 65 additions and 212 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 { Open_Sans } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";



@@ -22,14 +23,16 @@ export const metadata: Metadata = {
  },
 };

+
+const libreBaskerville = Libre_Baskerville({
+  variable: "--font-libre-baskerville",
+  subsets: ["latin"],
+  weight: ["400", "700"],
+});
 const inter = Inter({
  variable: "--font-inter",
  subsets: ["latin"],
 });
-const openSans = Open_Sans({
-  variable: "--font-open-sans",
-  subsets: ["latin"],
-});

 export default function RootLayout({
  children,
@@ -39,7 +42,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
+        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,7 +10,7 @@ import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
-import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
+import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
 import { Award, Shield, Star } from "lucide-react";

@@ -33,25 +33,15 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
        {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
        {
-          name: "Products",
-          id: "products",
-        },
+          name: "Products",          id: "products"},
        {
-          name: "Bulk Orders",
-          id: "dojo",
-        },
+          name: "Bulk Orders",          id: "dojo"},
        {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "Contact",          id: "contact"},
      ]}
      brandName="MIRAI"
    />
@@ -60,64 +50,39 @@ export default function LandingPage() {
  <div id="hero" data-section="hero">
      <HeroCentered
      background={{
-        variant: "radial-gradient",
-      }}
+        variant: "radial-gradient"}}
      title="MIRAI"
      description="Premium Karate Uniforms. Engineered for excellence, crafted for the disciplined."
      avatars={[
        {
-          src: "http://img.b2bpic.net/free-photo/woman-meditating-with-her-eyes-closed_23-2148322409.jpg",
-          alt: "karate athlete gi black background",
-        },
+          src: "http://img.b2bpic.net/free-photo/woman-meditating-with-her-eyes-closed_23-2148322409.jpg",          alt: "karate athlete gi black background"},
        {
-          src: "http://img.b2bpic.net/free-photo/shaved-head-karate-fighter-sits-tatami-gym_613910-13403.jpg",
-          alt: "Shaved head karate fighter sits on the tatami in a gym.",
-        },
+          src: "http://img.b2bpic.net/free-photo/shaved-head-karate-fighter-sits-tatami-gym_613910-13403.jpg",          alt: "Shaved head karate fighter sits on the tatami in a gym."},
        {
-          src: "http://img.b2bpic.net/free-photo/full-shot-asian-man-practicing-taekwondo_23-2150260492.jpg",
-          alt: "Full shot asian man practicing taekwondo",
-        },
+          src: "http://img.b2bpic.net/free-photo/full-shot-asian-man-practicing-taekwondo_23-2150260492.jpg",          alt: "Full shot asian man practicing taekwondo"},
        {
-          src: "http://img.b2bpic.net/free-photo/front-view-woman-doing-karate-pose_23-2148446183.jpg",
-          alt: "Front view woman doing karate pose",
-        },
+          src: "http://img.b2bpic.net/free-photo/front-view-woman-doing-karate-pose_23-2148446183.jpg",          alt: "Front view woman doing karate pose"},
        {
-          src: "http://img.b2bpic.net/free-photo/athlete-female-training-karate-outfit_23-2148324760.jpg",
-          alt: "Athlete female training in karate outfit",
-        },
+          src: "http://img.b2bpic.net/free-photo/athlete-female-training-karate-outfit_23-2148324760.jpg",          alt: "Athlete female training in karate outfit"},
      ]}
      buttons={[
        {
-          text: "View Products",
-          href: "#products",
-        },
+          text: "View Products",          href: "#products"},
        {
-          text: "Contact Us",
-          href: "#contact",
-        },
+          text: "Contact Us",          href: "#contact"},
      ]}
      buttonAnimation="slide-up"
      marqueeItems={[
        {
-          type: "text",
-          text: "Premium Grade",
-        },
+          type: "text",          text: "Premium Grade"},
        {
-          type: "text",
-          text: "Japanese Design",
-        },
+          type: "text",          text: "Japanese Design"},
        {
-          type: "text",
-          text: "Elite Performance",
-        },
+          type: "text",          text: "Elite Performance"},
        {
-          type: "text",
-          text: "Durable Stitching",
-        },
+          type: "text",          text: "Durable Stitching"},
        {
-          type: "text",
-          text: "Worldwide Shipping",
-        },
+          type: "text",          text: "Worldwide Shipping"},
      ]}
    />
  </div>
@@ -129,13 +94,9 @@ export default function LandingPage() {
      description="MIRAI uniforms are designed to meet the rigorous demands of professional martial artists. We blend traditional Japanese aesthetics with modern performance fabrics for ultimate comfort and range of motion."
      metrics={[
        {
-          value: "100%",
-          title: "Premium Fabric",
-        },
+          value: "100%",          title: "Premium Fabric"},
        {
-          value: "24h",
-          title: "Fast Shipping",
-        },
+          value: "24h",          title: "Fast Shipping"},
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/medium-shot-asian-people-practicing-taekwondo_23-2150753763.jpg"
      imageAlt="karate black belt close up"
@@ -144,65 +105,29 @@ export default function LandingPage() {
  </div>

  <div id="products" data-section="products">
-      <ProductCardTwo
+      <ProductCardThree
      animationType="slide-up"
      textboxLayout="split"
      gridVariant="three-columns-all-equal-width"
      useInvertedBackground={false}
      products={[
        {
-          id: "p1",
-          brand: "MIRAI",
-          name: "Elite Kata Gi",
-          price: "$150",
-          rating: 5,
-          reviewCount: "24",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-fighter-straighten-her-belt_23-2148322385.jpg",
+          id: "p1",          name: "Elite Kata Gi",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/karate-athlete-standing-ready_107420-64956.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
        {
-          id: "p2",
-          brand: "MIRAI",
-          name: "Training Kumite Gi",
-          price: "$120",
-          rating: 5,
-          reviewCount: "18",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-martial-arts-costume_23-2148324739.jpg",
+          id: "p2",          name: "Training Kumite Gi",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/male-karate-fighter-training_613910-1888.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
        {
-          id: "p3",
-          brand: "MIRAI",
-          name: "Sensei Classic Edition",
-          price: "$180",
-          rating: 5,
-          reviewCount: "12",
-          imageSrc: "http://img.b2bpic.net/free-photo/proud-karate-fighter-holding-black-belt_23-2148446199.jpg",
+          id: "p3",          name: "Sensei Classic Edition",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/determined-karate-athlete-focused_107420-65012.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
        {
-          id: "p4",
-          brand: "MIRAI",
-          name: "Beginner Starter Gi",
-          price: "$80",
-          rating: 4,
-          reviewCount: "45",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-asian-boy-practicing-taekwondo_23-2150753769.jpg",
+          id: "p4",          name: "Beginner Starter Gi",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/young-karate-practitioner-in-action_107420-64998.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
        {
-          id: "p5",
-          brand: "MIRAI",
-          name: "Pro Master Gi",
-          price: "$210",
-          rating: 5,
-          reviewCount: "8",
-          imageSrc: "http://img.b2bpic.net/free-photo/karate-woman-showing-ok-sign_23-2148446224.jpg",
+          id: "p5",          name: "Pro Master Gi",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/karate-master-striking-pose_107420-64972.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
        {
-          id: "p6",
-          brand: "MIRAI",
-          name: "Lightweight Sparring Gi",
-          price: "$100",
-          rating: 4,
-          reviewCount: "30",
-          imageSrc: "http://img.b2bpic.net/free-photo/female-fighter-martial-art-costume_23-2148324804.jpg",
+          id: "p6",          name: "Lightweight Sparring Gi",          price: "",          imageSrc: "http://img.b2bpic.net/free-photo/woman-practicing-karate-dynamic_107420-65005.jpg",          priceButtonProps: { text: "Contact to Order", href: "#contact" }
        },
      ]}
      title="Professional Collections"
@@ -218,25 +143,13 @@ export default function LandingPage() {
      useInvertedBackground={false}
      metrics={[
        {
-          id: "m1",
-          value: "50+",
-          title: "Dojos Served",
-          description: "Clubs across the country",
-          icon: Award,
+          id: "m1",          value: "50+",          title: "Dojos Served",          description: "Clubs across the country",          icon: Award,
        },
        {
-          id: "m2",
-          value: "1.2k",
-          title: "Uniforms Sold",
-          description: "Delivering quality daily",
-          icon: Shield,
+          id: "m2",          value: "1.2k",          title: "Uniforms Sold",          description: "Delivering quality daily",          icon: Shield,
        },
        {
-          id: "m3",
-          value: "4.9",
-          title: "Rating",
-          description: "Customer satisfaction",
-          icon: Star,
+          id: "m3",          value: "4.9",          title: "Rating",          description: "Customer satisfaction",          icon: Star,
        },
      ]}
      title="Trusted by Experts"
@@ -250,45 +163,15 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "t1",
-          title: "Elite Quality",
-          quote: "The best gi I've owned in 10 years of training.",
-          name: "Hiroshi Tanaka",
-          role: "Sensei",
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-attractive-male-standing-with-crossed-arms-isolated-white-background_181624-45641.jpg",
-        },
+          id: "t1",          title: "Elite Quality",          quote: "The best gi I've owned in 10 years of training.",          name: "Hiroshi Tanaka",          role: "Sensei",          imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-attractive-male-standing-with-crossed-arms-isolated-white-background_181624-45641.jpg"},
        {
-          id: "t2",
-          title: "Perfect Fit",
-          quote: "Excellent range of motion and very durable material.",
-          name: "Sarah Jenkins",
-          role: "Athlete",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-fighter-ready-get-into-combat_23-2148322340.jpg",
-        },
+          id: "t2",          title: "Perfect Fit",          quote: "Excellent range of motion and very durable material.",          name: "Sarah Jenkins",          role: "Athlete",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-fighter-ready-get-into-combat_23-2148322340.jpg"},
        {
-          id: "t3",
-          title: "Professional",
-          quote: "Fast shipping and fantastic customer service.",
-          name: "Kenji Sato",
-          role: "Student",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-woman-kimono-greeting-white_549566-575.jpg",
-        },
+          id: "t3",          title: "Professional",          quote: "Fast shipping and fantastic customer service.",          name: "Kenji Sato",          role: "Student",          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-woman-kimono-greeting-white_549566-575.jpg"},
        {
-          id: "t4",
-          title: "Top Tier",
-          quote: "Gold embroidery looks amazing, quality is unmatched.",
-          name: "Elena Rossi",
-          role: "Champion",
-          imageSrc: "http://img.b2bpic.net/free-photo/karate-player-man-posing-looking_107420-64916.jpg",
-        },
+          id: "t4",          title: "Top Tier",          quote: "Gold embroidery looks amazing, quality is unmatched.",          name: "Elena Rossi",          role: "Champion",          imageSrc: "http://img.b2bpic.net/free-photo/karate-player-man-posing-looking_107420-64916.jpg"},
        {
-          id: "t5",
-          title: "Recommended",
-          quote: "Everything I needed for my daily sessions.",
-          name: "Marcus Wong",
-          role: "Instructor",
-          imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-bearded-brutal-karate-fighter-dressed-white-kimono-grey-background_613910-1890.jpg",
-        },
+          id: "t5",          title: "Recommended",          quote: "Everything I needed for my daily sessions.",          name: "Marcus Wong",          role: "Instructor",          imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-bearded-brutal-karate-fighter-dressed-white-kimono-grey-background_613910-1890.jpg"},
      ]}
      title="Voice of the Practitioners"
      description="What our karate community has to say."
@@ -302,22 +185,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      plans={[
        {
-          id: "bulk",
-          title: "Club Partner",
-          price: "Custom",
-          period: "/per order",
-          features: [
-            "Volume discounts",
-            "Custom embroidery",
-            "Priority support",
-          ],
+          id: "bulk",          title: "Club Partner",          price: "Custom",          period: "/per order",          features: [
+            "Volume discounts",            "Custom embroidery",            "Priority support"],
          button: {
-            text: "Inquire Bulk",
-            href: "#contact",
-          },
-          imageSrc: "http://img.b2bpic.net/free-photo/fashion-photo-young-magnificent-woman-white-shirt_158595-1011.jpg",
-          imageAlt: "Fashion photo of young magnificent woman in white shirt",
-        },
+            text: "Inquire Bulk",            href: "#contact"},
+          imageSrc: "http://img.b2bpic.net/free-photo/fashion-photo-young-magnificent-woman-white-shirt_158595-1011.jpg",          imageAlt: "Fashion photo of young magnificent woman in white shirt"},
      ]}
      title="Bulk Orders for Dojos"
      description="Equip your entire club with professional-grade gear."
@@ -330,20 +202,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      faqs={[
        {
-          id: "f1",
-          title: "How do I choose my size?",
-          content: "Consult our size chart for precise fitting instructions.",
-        },
+          id: "f1",          title: "How do I choose my size?",          content: "Consult our size chart for precise fitting instructions."},
        {
-          id: "f2",
-          title: "Is the material breathable?",
-          content: "Yes, our uniforms are crafted for maximum airflow.",
-        },
+          id: "f2",          title: "Is the material breathable?",          content: "Yes, our uniforms are crafted for maximum airflow."},
        {
-          id: "f3",
-          title: "How long does shipping take?",
-          content: "Domestic orders arrive within 3-5 business days.",
-        },
+          id: "f3",          title: "How long does shipping take?",          content: "Domestic orders arrive within 3-5 business days."},
      ]}
      title="Frequently Asked"
      description="Common questions about our products."
@@ -357,14 +220,11 @@ export default function LandingPage() {
      <ContactText
      useInvertedBackground={false}
      background={{
-        variant: "radial-gradient",
-      }}
+        variant: "radial-gradient"}}
      text="Ready to equip your journey? Contact us today for inquiries or custom bulk requests."
      buttons={[
        {
-          text: "Send Message",
-          href: "#",
-        },
+          text: "Send Message",          href: "#"},
      ]}
    />
  </div>
@@ -373,29 +233,19 @@ export default function LandingPage() {
      <FooterBase
      columns={[
        {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
            {
-              label: "About",
-              href: "#about",
-            },
+              label: "About",              href: "#about"},
            {
-              label: "Shop",
-              href: "#products",
-            },
+              label: "Shop",              href: "#products"},
          ],
        },
        {
-          title: "Support",
-          items: [
+          title: "Support",          items: [
            {
-              label: "FAQ",
-              href: "#faq",
-            },
+              label: "FAQ",              href: "#faq"},
            {
-              label: "Contact",
-              href: "#contact",
-            },
+              label: "Contact",              href: "#contact"},
          ],
        },
      ]}
--- 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-open-sans), 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), sans-serif;
+  font-family: var(--font-libre-baskerville), serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -12,13 +12,13 @@

  --background: #0a0a0a;
  --card: #1a1a1a;
-  --foreground: #ffffff;
+  --foreground: #f5f5f5;
  --primary-cta: #d4af37;
  --primary-cta-text: #000000;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #1a1a1a;
  --secondary-cta-text: #0a0a0a;
-  --accent: #d4af37;
-  --background-accent: #1a1a1a;
+  --accent: #b8860b;
+  --background-accent: #8b6914;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	7aa86191a1	Merge version_2 into main Merge version_2 into main	2026-05-17 11:14:24 +00:00
bender	0a61e71409	Update theme fonts	2026-05-17 11:14:21 +00:00
bender	ea27464c03	Update theme fonts	2026-05-17 11:14:21 +00:00
bender	c2983a0618	Merge version_2 into main Merge version_2 into main	2026-05-17 11:11:56 +00:00
bender	a9c6f48872	Update src/app/styles/variables.css	2026-05-17 11:11:53 +00:00
bender	f05d4205cb	Update src/app/styles/base.css	2026-05-17 11:11:52 +00:00
bender	abcdefc7aa	Update src/app/page.tsx	2026-05-17 11:11:52 +00:00