bender/35069a9c-d47a-4ddb-baef-0337e5705f49
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_3
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1
..
compare: bender:main
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1

7 Commits
version_3 ... main

Author SHA1 Message Date
bender
3d408c4300 Merge version_4 into main 
Merge version_4 into main
 2026-05-12 20:13:58 +00:00
bender
26dd61628b Update theme fonts 2026-05-12 20:13:55 +00:00
bender
5ac8e6910b Update theme fonts 2026-05-12 20:13:55 +00:00
bender
1b5c188184 Merge version_4 into main 
Merge version_4 into main
 2026-05-12 20:03:25 +00:00
bender
e148fe8528 Update src/app/page.tsx 2026-05-12 20:03:22 +00:00
bender
ff5013c8c6 Merge version_3 into main 
Merge version_3 into main
 2026-05-12 19:56:09 +00:00
bender
9a99259157 Merge version_3 into main 
Merge version_3 into main
 2026-05-12 19:55:40 +00:00
3 changed files with 9 additions and 11 deletions
Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Mulish } from "next/font/google"; import { Mulish } from "next/font/google";
import { Nunito_Sans } from "next/font/google";
@@ -20,12 +21,9 @@ export const metadata: Metadata = {
}, },
}; };
const mulish = Mulish({
variable: "--font-mulish", const nunitoSans = Nunito_Sans({
subsets: ["latin"], variable: "--font-nunito-sans",
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -37,7 +35,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}> <body className={`${nunitoSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

2
src/app/page.tsx
View File

@@ -100,7 +100,7 @@ export default function LandingPage() {
<TestimonialCardFifteen <TestimonialCardFifteen
testimonial="Finally a barbershop that really cares. I always walk out looking like a new man. Professional service and a great atmosphere every time!" testimonial="Finally a barbershop that really cares. I always walk out looking like a new man. Professional service and a great atmosphere every time!"
rating={5} rating={5}
author="Michael Smith" author="Michael Smith, Local Regular"
avatars={[{ src: "https://img.b2bpic.net/free-photo/happy-man-after-barber-visit_23-2149186474.jpg", alt: "Client" }]} avatars={[{ src: "https://img.b2bpic.net/free-photo/happy-man-after-barber-visit_23-2149186474.jpg", alt: "Client" }]}
ratingAnimation="blur-reveal" ratingAnimation="blur-reveal"
avatarsAnimation="slide-up" avatarsAnimation="slide-up"

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-inter), sans-serif; font-family: var(--font-nunito-sans), 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-mulish), sans-serif; font-family: var(--font-nunito-sans), sans-serif;
} }