Merge version_1 into main #5

Merged
bender merged 2 commits from version_1 into main 2026-02-21 12:09:58 +00:00
2 changed files with 7 additions and 9 deletions

View File

@@ -6,6 +6,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Inter } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
@@ -23,12 +24,9 @@ export const metadata: Metadata = {
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
@@ -40,7 +38,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-manrope), 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;
}