bender/3359d886-55d4-4209-8ab6-e10f502f041d
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge version_17 into main

Browse Source 
Merge version_17 into main
This commit was merged in pull request #33.
This commit is contained in:
bender
2026-04-16 20:41:56 +00:00
parent 5ec57896ca 5072c7f1ad
commit 3046a23a28
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

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

4
src/app/styles/base.css
View File

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