Merge version_1 into main #15

Merged
bender merged 2 commits from version_1 into main 2026-02-15 12:56:16 +00:00
2 changed files with 13 additions and 2 deletions

View File

@@ -26,6 +26,8 @@ import { Manrope } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Josefin_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
@@ -159,6 +161,15 @@ const inter = Inter({
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -167,7 +178,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${josefinSans.variable} ${inter.variable} antialiased`}>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
<Tag />
{children}

View File

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