bender/0c5408b1-1dbc-40fe-aa1b-6e8be2675cee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
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_7
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

11 Commits
version_2 ... version_7

Author SHA1 Message Date
bender
44bf68327c Update src/app/styles/variables.css 2026-03-04 14:09:02 +00:00
bender
8a4697d2d3 Merge version_6 into main 
Merge version_6 into main
 2026-03-04 13:32:46 +00:00
bender
f2fc387c28 Update src/app/styles/variables.css 2026-03-04 13:32:41 +00:00
bender
36918ed9ae Merge version_5 into main 
Merge version_5 into main
 2026-03-04 13:04:50 +00:00
bender
4c55c03794 Update src/app/styles/variables.css 2026-03-04 13:04:46 +00:00
bender
b3cb0b2cb7 Merge version_4 into main 
Merge version_4 into main
 2026-03-04 12:10:18 +00:00
bender
53c059d912 Update src/app/page.tsx 2026-03-04 12:10:11 +00:00
bender
cda495c13f Merge version_3 into main 
Merge version_3 into main
 2026-03-04 12:04:48 +00:00
bender
0972431ef8 Update src/app/styles/base.css 2026-03-04 12:04:43 +00:00
bender
1bab987b5e Update src/app/layout.tsx 2026-03-04 12:04:41 +00:00
bender
6f3125d7d5 Merge version_2 into main 
Merge version_2 into main
 2026-03-04 11:56:35 +00:00
4 changed files with 15 additions and 26 deletions
Expand all files Collapse all files

21
src/app/layout.tsx
View File

@@ -1,23 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google"; import { Lato } from "next/font/google";
import { Inter } from "next/font/google";
import { Roboto } 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";
const halant = Halant({ const lato = Lato({
variable: "--font-halant", subsets: ["latin"], variable: "--font-lato", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"], weight: ["100", "300", "400", "700", "900"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const roboto = Roboto({
variable: "--font-roboto", subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -46,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${halant.variable} ${inter.variable} ${roboto.variable} antialiased`} className={`${lato.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

2
src/app/page.tsx
View File

@@ -40,7 +40,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroBillboardTestimonial <HeroBillboardTestimonial
title="Freshly Baked Goodness Every Day" title="Freshly Baked Goodness - Every Day"
description="Experience the warmth of artisanal baking. From classic loaves to delicate pastries, every product is crafted with love and the finest ingredients." description="Experience the warmth of artisanal baking. From classic loaves to delicate pastries, every product is crafted with love and the finest ingredients."
tag="Premium Bakery" tag="Premium Bakery"
tagIcon={Sparkles} tagIcon={Sparkles}

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

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

@@ -10,15 +10,15 @@
--accent: #737373;; --accent: #737373;;
--background-accent: #737373;; */ --background-accent: #737373;; */
--background: #0a0a0a;; --background: #080000;;
--card: #1a1a1a;; --card: #1d0d0d;;
--foreground: #ffffffe6;; --foreground: #ffe6e6;;
--primary-cta: #e6e6e6;; --primary-cta: #ff3d4a;;
--primary-cta-text: #f5f5f5;; --primary-cta-text: #f5f5f5;;
--secondary-cta: #1a1a1a;; --secondary-cta: #1f0a0a;;
--secondary-cta-text: #1c1c1c;; --secondary-cta-text: #1c1c1c;;
--accent: #737373;; --accent: #7b2d2d;;
--background-accent: #737373;; --background-accent: #b8111f;;
/* 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);