bender/26f30ed2-87d4-463d-b603-4e267b07b0b7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_17 into main #17

Merged
bender merged 3 commits from version_17 into main 2026-05-24 21:00:23 +00:00
Conversation 0 Commits 3 Files Changed 2 +9 -4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/layout.tsx
View File

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

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

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