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_1
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_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

5 Commits
version_1 ... version_3

Author SHA1 Message Date
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
bender
88fcf689d4 Update src/app/styles/variables.css 2026-03-04 11:56:31 +00:00
bender
72f2c68465 Update src/app/layout.tsx 2026-03-04 11:56:30 +00:00
3 changed files with 23 additions and 33 deletions
Expand all files Collapse all files

24
src/app/layout.tsx
View File

@@ -1,23 +1,12 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Roboto } from "next/font/google";
import { Lato } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const roboto = Roboto({
variable: "--font-roboto", subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
const lato = Lato({
variable: "--font-lato", subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
export const metadata: Metadata = {
@@ -28,7 +17,8 @@ export const metadata: Metadata = {
openGraph: {
title: "Sweet Crust Bakery - Premium Artisan Baking", description: "Experience 40 years of baking excellence with handcrafted pastries and fresh bread.", type: "website", siteName: "Sweet Crust Bakery", images: [
{
url: "http://img.b2bpic.net/free-photo/various-baking-supermarket-shelves-sale_627829-7384.jpg", alt: "Fresh bakery display"},
url: "http://img.b2bpic.net/free-photo/various-baking-supermarket-shelves-sale_627829-7384.jpg", alt: "Fresh bakery display"
},
],
},
twitter: {
@@ -45,7 +35,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${roboto.variable} antialiased`}
className={`${lato.variable} antialiased`}
>
<Tag />
{children}

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-roboto), sans-serif;
font-family: var(--font-lato), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-roboto), sans-serif;
font-family: var(--font-lato), sans-serif;
}

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f3251;;
--secondary-cta: #ffffff;;
--accent: #15479c;;
--background-accent: #a8cce8;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f3251;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #ffffffe6;;
--primary-cta: #e6e6e6;;
--primary-cta-text: #f5f5f5;;
--secondary-cta: #ffffff;;
--secondary-cta: #1a1a1a;;
--secondary-cta-text: #1c1c1c;;
--accent: #15479c;;
--background-accent: #a8cce8;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);