Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-04-15 07:29:58 +00:00
2 changed files with 6 additions and 4 deletions

View File

@@ -10,6 +10,7 @@ import { Nunito } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Mulish } from "next/font/google";
import { Public_Sans } from "next/font/google";
@@ -27,8 +28,9 @@ export const metadata: Metadata = {
const mulish = Mulish({
variable: "--font-mulish",
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
@@ -44,7 +46,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-mulish), sans-serif;
font-family: var(--font-public-sans), sans-serif;
}