Merge version_4 into main

Merge version_4 into main
This commit was merged in pull request #9.
This commit is contained in:
2026-05-29 22:31:25 +00:00
2 changed files with 8 additions and 5 deletions

View File

@@ -8,6 +8,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Open_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -19,9 +20,11 @@ export const metadata: Metadata = {
const inter = Inter({
variable: "--font-inter",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -32,7 +35,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${inter.variable} antialiased`}>
<body className={`${poppins.variable} antialiased`}>
{children}
<script

View File

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