bender/3a6e61c2-f89f-4247-95f5-2fbdc2b689c4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_3
Branches Tags
bender:main bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_4
Branches Tags
bender:main bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

9 Commits
version_3 ... version_4

Author SHA1 Message Date
bender
8313a676d2 Update theme fonts 2026-02-18 16:18:48 +00:00
bender
c4f4932fb7 Update theme fonts 2026-02-18 16:18:47 +00:00
bender
b49e234e9a Update theme fonts 2026-02-18 16:18:37 +00:00
bender
4a9d7dda21 Update theme fonts 2026-02-18 16:18:36 +00:00
bender
fe7dfecc44 Update theme fonts 2026-02-18 16:18:27 +00:00
bender
b3239e0d25 Update theme fonts 2026-02-18 16:18:26 +00:00
bender
38ba9efff6 Update src/app/page.tsx 2026-02-18 16:06:55 +00:00
bender
db24c79477 Merge version_3 into main 
Merge version_3 into main
 2026-02-18 16:00:18 +00:00
bender
7900afcbe2 Merge version_3 into main 
Merge version_3 into main
 2026-02-18 15:57:45 +00:00
3 changed files with 46 additions and 16 deletions
Expand all files Collapse all files

37
src/app/layout.tsx
View File

@@ -3,6 +3,12 @@ import { Archivo } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const archivo = Archivo({ const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"], variable: "--font-archivo", subsets: ["latin"],
@@ -30,6 +36,33 @@ export const metadata: Metadata = {
} }
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -38,9 +71,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${publicSans.variable} ${inter.variable} antialiased`}>
className={archivo.variable}
>
<Tag /> <Tag />
{children} {children}

21
src/app/page.tsx
View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroBillboard from '@/components/sections/hero/HeroBillboard'; import HeroBillboard from '@/components/sections/hero/HeroBillboard';
import FeatureCardOne from '@/components/sections/feature/FeatureCardOne'; import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard'; import AboutMetric from '@/components/sections/about/AboutMetric';
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix'; import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
import MetricCardThree from '@/components/sections/metrics/MetricCardThree'; import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
import TeamCardSix from '@/components/sections/team/TeamCardSix'; import TeamCardSix from '@/components/sections/team/TeamCardSix';
@@ -109,16 +109,15 @@ export default function LandingPage() {
</div> </div>
<div id="about" data-section="about"> <div id="about" data-section="about">
<TestimonialAboutCard <AboutMetric
title="Refined Barbershop Heritage" title="At Refined Barber we redefine barbering by empowering clients to look and feel their absolute best"
description="With over 15 years in the grooming industry, we've perfected the art of classic barbering combined with modern expertise." metrics={[
subdescription="Our shop is a sanctuary where tradition meets innovation, delivering exceptional grooming experiences with personalized attention to every client." { icon: Users, label: "Satisfied Clients", value: "2,000+" },
tag="Our Story" { icon: Star, label: "5-Star Rating", value: "98%" },
tagIcon={History} { icon: Award, label: "Years Experience", value: "15+" },
icon={Award} { icon: Zap, label: "Monthly Appointments", value: "800+" }
imageSrc="https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg" ]}
imageAlt="Refined Barbershop Heritage" metricsAnimation="slide-up"
mediaAnimation="slide-up"
useInvertedBackground={true} useInvertedBackground={true}
/> />
</div> </div>

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-archivo), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-archivo), sans-serif; font-family: var(--font-public-sans), sans-serif;
} }