Merge version_8 into main #15

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

View File

@@ -10,6 +10,7 @@ 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";
import { Public_Sans } from "next/font/google";
@@ -26,10 +27,10 @@ export const metadata: Metadata = {
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
@@ -44,7 +45,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

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