Merge version_7 into main
Merge version_7 into main
This commit was merged in pull request #14.
This commit is contained in:
@@ -10,6 +10,7 @@ import { Public_Sans } from "next/font/google";
|
||||
import { Montserrat } from "next/font/google";
|
||||
import { Nunito_Sans } from "next/font/google";
|
||||
import { Manrope } from "next/font/google";
|
||||
import { Nunito } from "next/font/google";
|
||||
|
||||
|
||||
|
||||
@@ -29,8 +30,9 @@ export const metadata: Metadata = {
|
||||
|
||||
|
||||
|
||||
const manrope = Manrope({
|
||||
variable: "--font-manrope",
|
||||
|
||||
const nunito = Nunito({
|
||||
variable: "--font-nunito",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
@@ -42,7 +44,7 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${manrope.variable} antialiased`}>
|
||||
<body className={`${nunito.variable} antialiased`}>
|
||||
<Tag />
|
||||
{children}
|
||||
<script
|
||||
|
||||
@@ -11,7 +11,7 @@ html {
|
||||
body {
|
||||
background-color: var(--background);
|
||||
color: var(--foreground);
|
||||
font-family: var(--font-manrope), sans-serif;
|
||||
font-family: var(--font-nunito), sans-serif;
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
overscroll-behavior: none;
|
||||
@@ -24,5 +24,5 @@ h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-family: var(--font-manrope), sans-serif;
|
||||
font-family: var(--font-nunito), sans-serif;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user