development/a1513cd5-b36e-4c7f-83b1-b210fede1279
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #3

Merged
development merged 4 commits from version_4 into main 2026-01-22 21:34:47 +00:00
Conversation 0 Commits 4 Files Changed 4 +33 -31
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/blog/page.tsx
View File

@@ -5,7 +5,7 @@ import ReactLenis from "lenis/react";
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterSimple from '@/components/sections/footer/FooterSimple';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
type BlogPost = {
id: string;
@@ -86,7 +86,7 @@ export default function BlogPage() {
<ThemeProvider
defaultButtonVariant="directional-hover"
defaultTextAnimation="reveal-blur"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="medium"
background="circleGradient"
@@ -97,15 +97,16 @@ export default function BlogPage() {
>
<ReactLenis root>
<div className="min-h-screen bg-background">
<NavbarLayoutFloatingInline
brandName="A Detailing"
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/home" },
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Why Us", id: "about" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Book Now", href: "#contact" }}
brandName="A Detailing"
bottomLeftText="San Diego, CA"
bottomRightText="hello@adetailing.com"
/>
{isLoading ? (

32
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
/* --background: #000000;;
--card: #1a1a1a;;
--foreground: #ffd700;;
--primary-cta: #ffd700;;
--secondary-cta: #000000;;
--accent: #ffd700;;
--background-accent: #333333;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #6139e6;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--background: #000000;;
--card: #1a1a1a;;
--foreground: #ffd700;;
--primary-cta: #ffd700;;
--secondary-cta: #000000;;
--accent: #ffd700;;
--background-accent: #333333;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -578,7 +578,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-source-code-pro), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -591,5 +591,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-source-code-pro), sans-serif;
font-family: var(--font-inter), sans-serif;
}

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Source_Code_Pro } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const sourceCodePro = Source_Code_Pro({
variable: "--font-source-code-pro", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -36,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${sourceCodePro.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}

11
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import HeroSplit from '@/components/sections/hero/HeroSplit';
import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
import MediaSplitTabsAbout from '@/components/sections/about/MediaSplitTabsAbout';
@@ -15,7 +15,7 @@ export default function LandingPage() {
<ThemeProvider
defaultButtonVariant="directional-hover"
defaultTextAnimation="reveal-blur"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="medium"
background="circleGradient"
@@ -25,14 +25,15 @@ export default function LandingPage() {
headingFontWeight="light"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
brandName="A Detailing"
<NavbarStyleFullscreen
navItems={[
{ name: "Services", id: "services" },
{ name: "Why Us", id: "about" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Book Now", href: "#contact" }}
brandName="A Detailing"
bottomLeftText="San Diego, CA"
bottomRightText="hello@adetailing.com"
/>
</div>