bender/8b88fe22-502f-40dd-8112-ea81e09424aa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #4

Merged
bender merged 1 commits from version_4 into main 2026-02-26 21:09:12 +00:00
Conversation 0 Commits 1 Files Changed 2 +14 -9
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,12 +1,10 @@
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 { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Artisan Bakery | Fresh Baked Goods Daily", description: "Handcrafted artisanal breads and pastries baked fresh daily with premium ingredients. Order online or visit our bakery for the finest baked goods in town.", keywords: "bakery, artisan bread, fresh pastries, sourdough, croissants, bagels, homemade baked goods", metadataBase: new URL("https://example.com"),
@@ -29,6 +27,15 @@ export const metadata: Metadata = {
}
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -37,9 +44,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${nunito.variable} antialiased`}
>
<body className={`${inter.variable} ${openSans.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-nunito), sans-serif;
font-family: var(--font-open-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-nunito), sans-serif;
font-family: var(--font-inter), sans-serif;
}