Merge version_3 into main
Merge version_3 into main
This commit was merged in pull request #6.
This commit is contained in:
@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
|
||||
import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { DM_Sans } from "next/font/google";
|
||||
import { Libre_Baskerville } from "next/font/google";
|
||||
import { Public_Sans } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -22,10 +23,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",
|
||||
@@ -40,7 +41,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
|
||||
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-libre-baskerville), serif;
|
||||
font-family: var(--font-public-sans), sans-serif;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user