bender/2c1cdebb-c410-4d5e-b703-a9c9da93399b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #11

Merged
bender merged 2 commits from version_2 into main 2026-02-20 21:26:32 +00:00
Conversation 0 Commits 2 Files Changed 2 +10 -5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/layout.tsx
View File

@@ -3,6 +3,7 @@ import { Ubuntu } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Cormorant_Garamond } from "next/font/google";
const ubuntu = Ubuntu({
variable: "--font-ubuntu", subsets: ["latin"],
@@ -27,6 +28,12 @@ export const metadata: Metadata = {
}
};
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -35,9 +42,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${ubuntu.variable} antialiased`}
>
<body className={`${cormorantGaramond.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-ubuntu), sans-serif;
font-family: var(--font-cormorant-garamond), serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-ubuntu), sans-serif;
font-family: var(--font-cormorant-garamond), serif;
}