Merge version_4 into main

Merge version_4 into main
This commit was merged in pull request #6.
This commit is contained in:
2026-05-07 15:07:14 +00:00
2 changed files with 7 additions and 9 deletions

View File

@@ -10,6 +10,7 @@ import { Libre_Baskerville } from "next/font/google";
import { Manrope } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Raleway } from "next/font/google";
@@ -21,12 +22,9 @@ export const metadata: Metadata = {
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
const raleway = Raleway({
variable: "--font-raleway",
subsets: ["latin"],
});
@@ -38,7 +36,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<body className={`${raleway.variable} antialiased`}>
<Tag />
{children}
<script

View File

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