bender/63826b7d-a2b9-4a4f-958e-88a95e23aec0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: 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
...
pull from: bender:version_5
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

4 Commits
version_3 ... version_5

Author SHA1 Message Date
kudindmitriy
889890b372 Bob AI: change font to Mulish + Inter 2026-02-27 09:34:10 +02:00
bender
17dfec37fd Merge version_4 into main 
Merge version_4 into main
 2026-02-27 07:32:21 +00:00
kudindmitriy
5739e47030 Bob AI: change theme to omething more vibrant and warm 2026-02-27 09:32:11 +02:00
bender
10a7af6fdb Merge version_3 into main 
Merge version_3 into main
 2026-02-27 07:30:10 +00:00
3 changed files with 27 additions and 22 deletions
Expand all files Collapse all files

19
src/app/layout.tsx
View File

@@ -1,17 +1,24 @@
import type { Metadata } from "next";
import { Nunito } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Mulish } from "next/font/google";
import { Inter } from "next/font/google";
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Artisan Bakery | Fresh Baked Goods Delivered Daily", description: "Discover freshly baked artisan breads, pastries, and cakes made daily with love. Order online for local delivery or visit our warm, inviting bakery today.", keywords: ["artisan bakery", "fresh baked goods", "sourdough bread", "croissants", "custom cakes", "local bakery", "online bakery orders", "pastries", "cinnamon rolls", "bakery delivery"]
};
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -20,9 +27,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${nunito.variable} antialiased`}
>
<body className={`${mulish.variable} ${inter.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-font-family: var(--font-nunito), sans-serif;), 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-font-family: var(--font-nunito), sans-serif;), sans-serif;
font-family: var(--font-mulish), sans-serif;
}

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

@@ -3,22 +3,22 @@
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0b07ff;;
--secondary-cta: #ffffff;;
--accent: #93b7ff;;
--background-accent: #a8bae8;; */
--card: #fff8f3;;
--foreground: #2d1810;;
--primary-cta: #ff6b35;;
--secondary-cta: #ffe5d9;;
--accent: #ffb84d;;
--background-accent: #ffa366;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0b07ff;;
--background: #fff0e6;;
--card: #fff8f3;;
--foreground: #2d1810;;
--primary-cta: #ff6b35;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta: #ffe5d9;;
--secondary-cta-text: #0c1325;;
--accent: #93b7ff;;
--background-accent: #a8bae8;;
--accent: #ffb84d;;
--background-accent: #ffa366;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);