bender/e60f5986-e700-4aeb-896d-04ac7acc431a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_1
Branches Tags
bender:main bender:version_4_1777013902063 bender:version_3_1777013892365 bender:version_2_1777013891064 bender:version_1
..
compare: bender:main
Branches Tags
bender:main bender:version_4_1777013902063 bender:version_3_1777013892365 bender:version_2_1777013891064 bender:version_1

14 Commits
version_1 ... main

Author SHA1 Message Date
bender
9d05a35466 Merge version_4_1777013902063 into main 
Merge version_4_1777013902063 into main
 2026-04-24 06:58:52 +00:00
bender
9589fd66bf Update theme fonts 2026-04-24 06:58:46 +00:00
bender
3404a73836 Update theme fonts 2026-04-24 06:58:46 +00:00
bender
3b6a45a729 Merge version_4_1777013902063 into main 
Merge version_4_1777013902063 into main
 2026-04-24 06:58:37 +00:00
bender
d08cc30157 Update theme fonts 2026-04-24 06:58:34 +00:00
bender
0254710420 Update theme fonts 2026-04-24 06:58:34 +00:00
bender
a0bcbfc703 Update theme fonts 2026-04-24 06:58:33 +00:00
bender
43e23b2623 Update theme fonts 2026-04-24 06:58:32 +00:00
bender
1645cb083c Merge version_4_1777013902063 into main 
Merge version_4_1777013902063 into main
 2026-04-24 06:58:25 +00:00
bender
921b7d4d16 Update theme colors 2026-04-24 06:58:22 +00:00
bender
0768570b59 Merge version_3_1777013892365 into main 
Merge version_3_1777013892365 into main
 2026-04-24 06:58:19 +00:00
bender
02f245e353 Merge version_2_1777013891064 into main 
Merge version_2_1777013891064 into main
 2026-04-24 06:58:14 +00:00
bender
580d97ac84 Update theme colors 2026-04-24 06:58:12 +00:00
bender
232d5e9788 Update theme colors 2026-04-24 06:58:11 +00:00
3 changed files with 23 additions and 14 deletions
Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -6,6 +6,8 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Nunito_Sans } from "next/font/google";
import { Mulish } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -14,8 +16,15 @@ export const metadata: Metadata = {
description: 'Expert floral design studio in your city. Bespoke bouquets and custom arrangements for weddings, events, and everyday beauty.',
};
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans",
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -27,7 +36,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${nunitoSans.variable} antialiased`}>
<body className={`${montserrat.variable} ${inter.variable} antialiased`}>
{children}
<script

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

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

18
src/app/styles/variables.css
View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f4ef;
--card: #dad6cd;
--foreground: #2a2928;
--primary-cta: #2a2928;
--primary-cta-text: #f5f4ef;
--secondary-cta: #ecebea;
--secondary-cta-text: #2a2928;
--accent: #ffffff;
--background-accent: #c6b180;
--background: #ffffff;
--card: #f9f9f9;
--foreground: #000612e6;
--primary-cta: #106EFB;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #000612e6;
--accent: #e2e2e2;
--background-accent: #106EFB;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);