Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-03-04 01:46:21 +00:00
4 changed files with 31 additions and 35 deletions

View File

@@ -1,18 +1,13 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } 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 inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const dmSans = DM_Sans({
@@ -42,7 +37,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${dmSans.variable} antialiased`}
className={`${poppins.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -9,20 +9,21 @@ import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Award, CheckCircle, Heart } from 'lucide-react';
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
background="grid"
cardStyle="glass-elevated"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="light"
borderRadius="rounded"
contentWidth="medium"
sizing="mediumLargeSizeMediumTitles"
background="none"
cardStyle="soft-shadow"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="semibold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
@@ -46,7 +47,7 @@ export default function LandingPage() {
{ text: "Explore Collection", href: "#products" },
{ text: "Learn More", href: "#about" }
]}
background={{ variant: "grid" }}
background={{ variant: "plain" }}
imageSrc="http://img.b2bpic.net/free-photo/couch-with-cushions-glass-table_1203-764.jpg"
imageAlt="Modern living room with contemporary furniture"
frameStyle="card"
@@ -98,8 +99,8 @@ export default function LandingPage() {
<div id="social-proof" data-section="social-proof">
<SocialProofOne
title="Featured In"
description="Trusted by leading design publications and interior enthusiasts worldwide"
title="Trusted by Design Enthusiasts Worldwide"
description="Featured in leading design publications and loved by thousands of homeowners"
names={[
"Design Magazine", "Home Weekly", "Living Today", "Modern Living", "Interiors Hub", "Style Collective", "Design Co.", "Home Studio"
]}
@@ -154,7 +155,7 @@ export default function LandingPage() {
{ text: "Get in Touch", href: "#" },
{ text: "Visit Us", href: "#" }
]}
background={{ variant: "grid" }}
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
</div>

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-dm-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-dm-sans), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
/* --background: #ffffff;;
--card: #f9f9f9;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--primary-cta: #2c2c2c;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
--accent: #15479c;;
--background-accent: #a8cce8;; */
--background: #f5f5f5;;
--card: #ffffff;;
--background: #ffffff;;
--card: #f9f9f9;;
--foreground: #1c1c1c;;
--primary-cta: #341f51;;
--primary-cta: #2c2c2c;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #1c1c1c;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--accent: #15479c;;
--background-accent: #a8cce8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);