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

Merge version_5 into main

Browse Source 
Merge version_5 into main
This commit was merged in pull request #5.
This commit is contained in:
bender
2026-02-27 07:34:22 +00:00
parent 17dfec37fd 889890b372
commit 767b7d030c
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/layout.tsx
View File

@@ -1,17 +1,24 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Nunito } 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";
import { Mulish } from "next/font/google";
import { Inter } from "next/font/google";
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
export const metadata: Metadata = { 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"] 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({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -20,9 +27,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${mulish.variable} ${inter.variable} antialiased`}>
className={`${nunito.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}

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