Merge version_6 into main

Merge version_6 into main
This commit was merged in pull request #11.
This commit is contained in:
2026-06-09 19:13:49 +00:00
2 changed files with 10 additions and 7 deletions

View File

@@ -11,6 +11,8 @@ import { Montserrat } from "next/font/google";
import { Roboto } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -49,12 +51,13 @@ export const metadata: Metadata = {
const publicSans = Public_Sans({
variable: "--font-public-sans",
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
@@ -66,7 +69,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter), sans-serif;
font-family: var(--font-dm-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-public-sans), sans-serif;
font-family: var(--font-manrope), sans-serif;
}