bender/4330d34e-ed17-41b4-af1f-2e6b7d1e6ca2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #3

Merged
bender merged 2 commits from version_1 into main 2026-02-27 12:06:15 +00:00
Conversation 0 Commits 2 Files Changed 2 +9 -8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -5,6 +5,7 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Josefin_Sans } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -12,15 +13,15 @@ export const metadata: Metadata = {
title: "Drink and Sleep - Cozy Coffee Shop for Remote Workers", description: "Discover the perfect blend of comfort and caffeine at Drink and Sleep. A serene space for coffee lovers and remote workers to relax, work, and recharge.", keywords: ["coffee shop", "cozy cafe", "remote work", "comfortable seating", "coffee lovers"],
};
const josefinSans = Josefin_Sans({
variable: "--font-josefin-sans",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({
children,
@@ -30,7 +31,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${josefinSans.variable} ${inter.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-inter), 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-josefin-sans), sans-serif;
font-family: var(--font-inter), sans-serif;
}