Merge version_1 into main #10

Merged
bender merged 2 commits from version_1 into main 2026-04-15 17:23:46 +00:00
2 changed files with 7 additions and 6 deletions

View File

@@ -13,6 +13,7 @@ import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Roboto } from "next/font/google";
import { Poppins } from "next/font/google";
import { Figtree } from "next/font/google";
@@ -31,10 +32,10 @@ export const metadata: Metadata = {
const poppins = Poppins({
variable: "--font-poppins",
const figtree = Figtree({
variable: "--font-figtree",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -45,7 +46,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${poppins.variable} antialiased`}>
<body className={`${figtree.variable} antialiased`}>
<Tag />
{children}
<script

View File

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