bender/83478ed3-5c01-4e0b-9efc-ecfd1e6fc010
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 2 commits from version_2 into main 2026-03-09 15:21:46 +00:00
Conversation 0 Commits 2 Files Changed 2 +14 -15
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/layout.tsx
View File

@@ -6,19 +6,10 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Brew Haven | Premium Specialty Coffee Shop", description: "Discover exceptional specialty coffee handcrafted by passionate baristas. Ethically sourced, expertly roasted, and served with care.", keywords: "coffee shop, specialty coffee, espresso, cold brew, artisan coffee, barista, sustainable coffee", robots: {
@@ -27,6 +18,16 @@ export const metadata: Metadata = {
},
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -35,9 +36,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${nunitoSans.variable} antialiased`}
>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

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