Merge version_4 into main

Update src/app/styles/base.css
2026-05-24 07:33:34 +00:00 · 2026-05-24 07:33:31 +00:00 · 2026-05-24 07:33:31 +00:00 · 2026-05-24 07:33:31 +00:00 · 2026-05-24 07:31:27 +00:00 · 2026-05-24 07:31:21 +00:00
3 changed files with 23 additions and 15 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,8 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Libre_Baskerville } from "next/font/google";
+import { Nunito } from "next/font/google";
+import { Mulish } from "next/font/google";



@@ -23,14 +25,12 @@ export const metadata: Metadata = {
  },
 };

-const libreBaskerville = Libre_Baskerville({
-  variable: "--font-libre-baskerville",
-  subsets: ["latin"],
-  weight: ["400", "700"],
+
+const nunito = Nunito({
+  variable: "--font-nunito",  subsets: ["latin"],
 });
-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+const mulish = Mulish({
+  variable: "--font-mulish",  subsets: ["latin"],
 });

 export default function RootLayout({
@@ -41,7 +41,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
+        <body className={`${nunito.variable} ${mulish.variable} antialiased`}>
          
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -53,6 +53,7 @@ export default function LandingPage() {
      imageSrc="http://img.b2bpic.net/free-photo/t-shirt-painting-indoors-still-life_23-2150572736.jpg?_wi=2"
      imageAlt="Cute anime collectibles"
      mediaAnimation="slide-up"
+      buttonAnimation="slide-up"
    />
  </div>

@@ -64,6 +65,8 @@ export default function LandingPage() {
      buttons={[{ text: "Browse Shop", href: "#products" }]}
      imageSrc="http://img.b2bpic.net/free-photo/digital-art-style-pottery-illustration_23-2151813477.jpg?_wi=2"
      imageAlt="organizing anime collectibles"
+      tagAnimation="slide-up"
+      buttonAnimation="slide-up"
    />
  </div>

@@ -80,18 +83,20 @@ export default function LandingPage() {
      ]}
      title="Why Buy from Me?"
      description="Dedicated to giving my fellow collectors the best experience possible."
+      buttonAnimation="slide-up"
    />
  </div>

  <div id="products" data-section="products">
      <ProductCardTwo
-      animationType="opacity"
+      animationType="slide-up"
      textboxLayout="default"
      gridVariant="uniform-all-items-equal"
      useInvertedBackground={false}
      products={[]}
      title="Featured Merchandise"
      description="Limited quantities available from my private collection."
+      buttonAnimation="slide-up"
    />
  </div>

@@ -103,6 +108,7 @@ export default function LandingPage() {
      plans={[]}
      title="Shop Tiers"
      description="Choose your level of collector experience."
+      buttonAnimation="slide-up"
    />
  </div>

@@ -113,8 +119,8 @@ export default function LandingPage() {
      rating={5}
      author="Sarah M."
      avatars={[]}
-      ratingAnimation="blur-reveal"
-      avatarsAnimation="blur-reveal"
+      ratingAnimation="slide-up"
+      avatarsAnimation="slide-up"
    />
  </div>

@@ -126,7 +132,8 @@ export default function LandingPage() {
      imageSrc="http://img.b2bpic.net/free-photo/purple-yeti-cartoon-with-boxes_23-2150248732.jpg"
      title="Collector FAQs"
      description="Answers to the most common questions about the shop."
-      faqsAnimation="blur-reveal"
+      faqsAnimation="slide-up"
+      mediaAnimation="slide-up"
    />
  </div>

@@ -138,6 +145,7 @@ export default function LandingPage() {
      title="Join the Collector List"
      description="Be the first to know about new listings from my personal collection."
      imageSrc="http://img.b2bpic.net/free-photo/young-man-knitting-while-relaxing_23-2149401794.jpg"
+      mediaAnimation="slide-up"
    />
  </div>

@@ -150,4 +158,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-inter), sans-serif;
+  font-family: var(--font-mulish), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-libre-baskerville), serif;
+  font-family: var(--font-nunito), sans-serif;
 }
Author	SHA1	Message	Date
bender	4d9bedbe6b	Merge version_4 into main Merge version_4 into main	2026-05-24 07:33:34 +00:00
bender	e0ac7973dc	Update src/app/styles/base.css	2026-05-24 07:33:31 +00:00
bender	f8016a39e6	Update src/app/page.tsx	2026-05-24 07:33:31 +00:00
bender	7c635772ff	Update src/app/layout.tsx	2026-05-24 07:33:31 +00:00
bender	7035b25d84	Merge version_3 into main Merge version_3 into main	2026-05-24 07:31:27 +00:00
bender	3aca3d3585	Update src/app/page.tsx	2026-05-24 07:31:21 +00:00
bender	f66c8b749a	Merge version_2 into main Merge version_2 into main	2026-05-24 07:13:38 +00:00
bender	afbf090d5e	Merge version_2 into main Merge version_2 into main	2026-05-24 07:13:07 +00:00