Merge version_3 into main #3

Merged
bender merged 4 commits from version_3 into main 2026-05-26 01:55:29 +00:00
4 changed files with 23 additions and 27 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Poppins } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -41,14 +42,12 @@ export const metadata: Metadata = {
},
};
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export default function RootLayout({
@@ -59,7 +58,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${poppins.variable} ${inter.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -16,24 +16,23 @@ import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCa
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="reveal-blur"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="largeSizeMediumTitles"
background="grid"
cardStyle="gradient-mesh"
sizing="mediumSizeLargeTitles"
background="noise"
cardStyle="soft-shadow"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="extrabold"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[]}
brandName="Good Day Plumbing | (801) 555-1234"
button={{
text: "Book Service", href: "#contact-final"}}
/>
</div>
@@ -64,8 +63,6 @@ export default function LandingPage() {
testimonialRotationInterval={5000}
tag="★★★★★ 4.8 Stars from 120+ Homeowners"
buttons={[
{
text: "Get a Free Estimate", href: "#contact-final"},
{
text: "Call Now", href: "tel:8015551234"},
]}
@@ -298,4 +295,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-poppins), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #F5F7FA;
--card: #FFFFFF;
--foreground: #0A2540;
--primary-cta: #FF7A00;
--background: #f5f5f5;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #1f3251;
--primary-cta-text: #FFFFFF;
--secondary-cta: #0B5FFF;
--secondary-cta: #ffffff;
--secondary-cta-text: #FFFFFF;
--accent: #0B5FFF;
--background-accent: #0B5FFF;
--accent: #15479c;
--background-accent: #a8cce8;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);