Merge version_25 into main

Merge version_25 into main
This commit was merged in pull request #68.
This commit is contained in:
2026-04-09 23:18:37 +00:00
2 changed files with 7 additions and 5 deletions

View File

@@ -11,6 +11,7 @@ import { Roboto } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
import { Manrope } from "next/font/google";
import { Figtree } from "next/font/google";
@@ -32,8 +33,9 @@ export const metadata: Metadata = {
const manrope = Manrope({
variable: "--font-manrope",
const figtree = Figtree({
variable: "--font-figtree",
subsets: ["latin"],
});
@@ -45,7 +47,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} antialiased`}>
<body className={`${figtree.variable} antialiased`}>
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-manrope), sans-serif;
font-family: var(--font-figtree), 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-figtree), sans-serif;
}