Merge version_13 into main #16

Merged
bender merged 2 commits from version_13 into main 2026-04-22 12:08:04 +00:00
2 changed files with 8 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Montserrat } from "next/font/google";
import { Poppins } from "next/font/google";
import { Mulish } from "next/font/google";
import { Inter_Tight } from "next/font/google";
@@ -24,9 +25,11 @@ export const metadata: Metadata = {
const mulish = Mulish({
variable: "--font-mulish",
const interTight = Inter_Tight({
variable: "--font-inter-tight",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -37,7 +40,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} antialiased`}>
<body className={`${interTight.variable} antialiased`}>
<Tag />
{children}
<script

View File

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