bender/52cb2989-b0c9-4ebb-9c7f-1b73e3730746
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #13

Merged
bender merged 2 commits from version_4 into main 2026-03-04 08:26:03 +00:00
Conversation 0 Commits 2 Files Changed 2 +12 -5
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -4,6 +4,7 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Raleway } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
export const metadata: Metadata = {
@@ -27,8 +28,14 @@ export const metadata: Metadata = {
}
};
const raleway = Raleway({
variable: "--font-raleway",
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -40,7 +47,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${raleway.variable} antialiased`}>
<body className={`${libreBaskerville.variable} ${inter.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-raleway), 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-raleway), sans-serif;
font-family: var(--font-libre-baskerville), serif;
}