Merge version_8 into main #14

Merged
bender merged 2 commits from version_8 into main 2026-04-12 05:57:23 +00:00
2 changed files with 12 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Playfair_Display, Lato } from "next/font/google";
import { Montserrat } from "next/font/google";
import { Figtree } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -24,8 +25,14 @@ export const metadata: Metadata = {
const figtree = Figtree({
variable: "--font-figtree",
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -37,7 +44,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${figtree.variable} antialiased`}>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-figtree), 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-figtree), sans-serif;
font-family: var(--font-libre-baskerville), serif;
}