Merge version_3 into main #2

Merged
bender merged 3 commits from version_3 into main 2026-04-23 17:02:46 +00:00
3 changed files with 8 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
@@ -20,13 +21,12 @@ export const metadata: Metadata = {
},
};
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export default function RootLayout({
@@ -37,7 +37,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${manrope.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -177,4 +177,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-public-sans), sans-serif;
font-family: var(--font-manrope), sans-serif;
}