Merge version_2 into main

Update src/app/styles/variables.css
2026-03-04 10:25:19 +00:00 · 2026-03-04 10:25:15 +00:00 · 2026-03-04 10:25:15 +00:00 · 2026-03-04 10:25:14 +00:00 · 2026-03-04 10:25:14 +00:00 · 2026-03-04 10:12:30 +00:00
4 changed files with 47 additions and 53 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,22 +1,17 @@
 import type { Metadata } from "next";
-import { Nunito_Sans } from "next/font/google";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
+import { Poppins } from "next/font/google";
+import { Montserrat } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";

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

-const halant = Halant({
-  variable: "--font-halant",  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
+const montserrat = Montserrat({
+  variable: "--font-montserrat",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
@@ -49,7 +44,7 @@ export default function RootLayout({
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
        <body
-          className={`${nunitoSans.variable} ${halant.variable} ${inter.variable} antialiased`}
+          className={`${poppins.variable} ${montserrat.variable} antialiased`}
        >
          <Tag />
          {children}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -14,16 +14,16 @@ import { Sparkles, Heart, Zap } from "lucide-react";
 export default function LandingPage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="directional-hover"
-      defaultTextAnimation="background-highlight"
-      borderRadius="pill"
-      contentWidth="small"
-      sizing="largeSmall"
-      background="noiseDiagonalGradient"
-      cardStyle="soft-shadow"
-      primaryButtonStyle="diagonal-gradient"
-      secondaryButtonStyle="solid"
-      headingFontWeight="semibold"
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLarge"
+      background="aurora"
+      cardStyle="glass-elevated"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
    >
      <div id="nav" data-section="nav">
        <NavbarStyleCentered
@@ -32,8 +32,7 @@ export default function LandingPage() {
            { name: "Gallery", id: "gallery" },
            { name: "Services", id: "services" },
            { name: "Testimonials", id: "testimonials" },
-            { name: "Contact", id: "contact" },
-            { name: "About", id: "about" }
+            { name: "Contact", id: "contact" }
          ]}
          button={{
            text: "Book via WhatsApp",            href: "contact"
@@ -103,7 +102,7 @@ export default function LandingPage() {
              id: "nails",              badge: "Nail Services",              badgeIcon: Sparkles,
              price: "₦7K - ₦15K",              subtitle: "Professional nail art and care",              buttons: [
                { text: "Book Now", href: "contact" },
-                { text: "Learn More", href: "#services" }
+                { text: "Learn More", href: "services" }
              ],
              features: [
                "Gel Polish Application",                "Acrylic & Stiletto Designs",                "French Manicure & Extensions",                "3D Nail Art & Embellishments",                "Nail Care & Treatments"
@@ -113,7 +112,7 @@ export default function LandingPage() {
              id: "makeup",              badge: "Makeup Services",              badgeIcon: Heart,
              price: "₦12K - ₦30K",              subtitle: "Flawless makeup for any occasion",              buttons: [
                { text: "Book Now", href: "contact" },
-                { text: "Learn More", href: "#services" }
+                { text: "Learn More", href: "services" }
              ],
              features: [
                "Bridal Makeup Packages",                "Party & Event Makeup",                "Everyday Glam",                "Contouring & Highlighting",                "Long-Lasting Formulas"
@@ -123,7 +122,7 @@ export default function LandingPage() {
              id: "combo",              badge: "Combo Packages",              badgeIcon: Zap,
              price: "₦25K - ₦50K",              subtitle: "Complete beauty transformation",              buttons: [
                { text: "Book Now", href: "contact" },
-                { text: "Learn More", href: "#services" }
+                { text: "Learn More", href: "services" }
              ],
              features: [
                "Nails + Makeup Bundle",                "Bride & Bridesmaid Packages",                "Event Party Packages",                "Group Discounts Available",                "Customized Packages"
@@ -184,7 +183,7 @@ export default function LandingPage() {
            {
              text: "Message on WhatsApp",              href: "https://wa.me/2349123456789?text=Hi%20Ambeswa!%20I'd%20like%20to%20book%20a%20service%20with%20The%20Weave%20Boutique"
            },
-            { text: "View Services", href: "#services" }
+            { text: "View Services", href: "services" }
          ]}
          background={{ variant: "plain" }}
          useInvertedBackground={false}
@@ -198,18 +197,18 @@ export default function LandingPage() {
          columns={[
            {
              title: "Services",              items: [
-                { label: "Nail Services", href: "#services" },
-                { label: "Makeup Services", href: "#services" },
-                { label: "Combo Packages", href: "#services" },
-                { label: "Event Bookings", href: "#contact" }
+                { label: "Nail Services", href: "services" },
+                { label: "Makeup Services", href: "services" },
+                { label: "Combo Packages", href: "services" },
+                { label: "Event Bookings", href: "contact" }
              ]
            },
            {
              title: "Company",              items: [
-                { label: "Gallery", href: "#gallery" },
-                { label: "Testimonials", href: "#testimonials" },
-                { label: "About Us", href: "#about" },
-                { label: "Contact", href: "#contact" }
+                { label: "Gallery", href: "gallery" },
+                { label: "Testimonials", href: "testimonials" },
+                { label: "About Us", href: "gallery" },
+                { 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-nunito-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-nunito-sans), sans-serif;
+  font-family: var(--font-montserrat), 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: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120a00e6;;
-  --primary-cta: #FF7B05;;
-  --secondary-cta: #f9f9f9;;
-  --accent: #e2e2e2;;
-  --background-accent: #FF7B05;; */
+  /* --background: #fcf6ec;;
+  --card: #f3ede2;;
+  --foreground: #2e2521;;
+  --primary-cta: #2e2521;;
+  --secondary-cta: #ffffff;;
+  --accent: #b2a28b;;
+  --background-accent: #b2a28b;; */

-  --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120a00e6;;
-  --primary-cta: #FF7B05;;
+  --background: #fcf6ec;;
+  --card: #f3ede2;;
+  --foreground: #2e2521;;
+  --primary-cta: #2e2521;;
  --primary-cta-text: #ffffff;;
-  --secondary-cta: #f9f9f9;;
+  --secondary-cta: #ffffff;;
  --secondary-cta-text: #120a00e6;;
-  --accent: #e2e2e2;;
-  --background-accent: #FF7B05;;
+  --accent: #b2a28b;;
+  --background-accent: #b2a28b;;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	b46f01a07e	Merge version_2 into main Merge version_2 into main	2026-03-04 10:25:19 +00:00
bender	28ce1c5f99	Update src/app/styles/variables.css	2026-03-04 10:25:15 +00:00
bender	9878b444e6	Update src/app/styles/base.css	2026-03-04 10:25:15 +00:00
bender	6d8f32323c	Update src/app/page.tsx	2026-03-04 10:25:14 +00:00
bender	cb9e37db75	Update src/app/layout.tsx	2026-03-04 10:25:14 +00:00
bender	ea256ad899	Merge version_1 into main Merge version_1 into main	2026-03-04 10:12:30 +00:00