Merge version_1 into main #4

Merged
bender merged 2 commits from version_1 into main 2026-02-15 12:01:41 +00:00
2 changed files with 9 additions and 3 deletions

View File

@@ -10,6 +10,7 @@ import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { Manrope } from "next/font/google";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
@@ -68,6 +69,11 @@ const inter = Inter({
subsets: ["latin"],
});
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -76,7 +82,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${manrope.variable} antialiased`}>
<Tag />
{children}

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-family: --font-manrope, sans-serif;), 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-family: --font-manrope, sans-serif;), sans-serif;
}