bender/83478ed3-5c01-4e0b-9efc-ecfd1e6fc010
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

9 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
100f7b6ac3 Update theme fonts 2026-03-09 15:22:31 +00:00
bender
7b5fd1e5c7 Update theme fonts 2026-03-09 15:22:30 +00:00
bender
88309cd736 Update theme fonts 2026-03-09 15:21:41 +00:00
bender
0d42112c1d Update theme fonts 2026-03-09 15:21:41 +00:00
bender
3987fd0133 Update src/app/styles/variables.css 2026-03-09 15:19:51 +00:00
bender
4c14ee6b99 Merge version_1 into main 
Merge version_1 into main
 2026-03-09 15:17:34 +00:00
bender
d31867e7fb Merge version_1 into main 
Merge version_1 into main
 2026-03-09 15:15:07 +00:00
bender
30ba9591f1 Merge version_1 into main 
Merge version_1 into main
 2026-03-09 15:14:16 +00:00
bender
1991a7ebf2 Merge version_1 into main 
Merge version_1 into main
 2026-03-09 15:13:05 +00:00
3 changed files with 18 additions and 22 deletions
Expand all files Collapse all files

22
src/app/layout.tsx
View File

@@ -6,19 +6,11 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; 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 { Libre_Baskerville } from "next/font/google";
import { Figtree } from "next/font/google";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Brew Haven | Premium Specialty Coffee Shop", description: "Discover exceptional specialty coffee handcrafted by passionate baristas. Ethically sourced, expertly roasted, and served with care.", keywords: "coffee shop, specialty coffee, espresso, cold brew, artisan coffee, barista, sustainable coffee", robots: { title: "Brew Haven | Premium Specialty Coffee Shop", description: "Discover exceptional specialty coffee handcrafted by passionate baristas. Ethically sourced, expertly roasted, and served with care.", keywords: "coffee shop, specialty coffee, espresso, cold brew, artisan coffee, barista, sustainable coffee", robots: {
@@ -27,6 +19,12 @@ export const metadata: Metadata = {
}, },
}; };
const figtree = Figtree({
variable: "--font-figtree",
subsets: ["latin"],
});
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -35,9 +33,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${figtree.variable} antialiased`}>
className={`${halant.variable} ${inter.variable} ${nunitoSans.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}
<script <script

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

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #ffffff; --background: #000000;
--card: #f9f9f9; --card: #0c0c0c;
--foreground: #120a00e6; --foreground: #ffffff;
--primary-cta: #FF7B05; --primary-cta: #10b981;
--primary-cta-text: #ffffff; --primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9; --secondary-cta: #000000;
--secondary-cta-text: #120a00e6; --secondary-cta-text: #120a00e6;
--accent: #e2e2e2; --accent: #10b981;
--background-accent: #FF7B05; --background-accent: #10b981;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);