bender/e5659748-3b8a-4c12-bf73-4de747f719b9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #10.
This commit is contained in:
bender
2026-05-05 15:24:16 +00:00
parent 51761a164a 86c37bc299
commit a612547583
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Roboto } from "next/font/google"; import { Roboto } from "next/font/google";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -23,9 +24,11 @@ export const metadata: Metadata = {
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans", const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"], subsets: ["latin"],
weight: ["400", "700"],
}); });
const inter = Inter({ const inter = Inter({
variable: "--font-inter", variable: "--font-inter",
@@ -40,7 +43,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

2
src/app/styles/base.css
View File

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-libre-baskerville), serif;
} }