Merge version_11 into main #15
@@ -9,6 +9,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
|
||||
import { Montserrat } from "next/font/google";
|
||||
import { DM_Sans } from "next/font/google";
|
||||
import { Roboto } from "next/font/google";
|
||||
import { Figtree } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -26,10 +27,10 @@ export const metadata: Metadata = {
|
||||
|
||||
|
||||
|
||||
const roboto = Roboto({
|
||||
variable: "--font-roboto",
|
||||
|
||||
const figtree = Figtree({
|
||||
variable: "--font-figtree",
|
||||
subsets: ["latin"],
|
||||
weight: ["100", "300", "400", "500", "700", "900"],
|
||||
});
|
||||
|
||||
export default function RootLayout({
|
||||
@@ -40,7 +41,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${roboto.variable} antialiased`}>
|
||||
<body className={`${figtree.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -11,7 +11,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-roboto), sans-serif;
|
||||
font-family: var(--font-figtree), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-roboto), sans-serif;
|
||||
font-family: var(--font-figtree), sans-serif;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user