bender/af7d191a-a626-4171-b588-e28ae67b1865
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_3
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1

5 Commits
version_3 ... main

Author SHA1 Message Date
bender
4d9bedbe6b Merge version_4 into main 
Merge version_4 into main
 2026-05-24 07:33:34 +00:00
bender
e0ac7973dc Update src/app/styles/base.css 2026-05-24 07:33:31 +00:00
bender
f8016a39e6 Update src/app/page.tsx 2026-05-24 07:33:31 +00:00
bender
7c635772ff Update src/app/layout.tsx 2026-05-24 07:33:31 +00:00
bender
7035b25d84 Merge version_3 into main 
Merge version_3 into main
 2026-05-24 07:31:27 +00:00
3 changed files with 11 additions and 11 deletions
Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -6,6 +6,8 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google";
import { Nunito } from "next/font/google";
import { Mulish } from "next/font/google";
@@ -23,14 +25,12 @@ export const metadata: Metadata = {
},
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
});
export default function RootLayout({
@@ -41,7 +41,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body className={`${nunito.variable} ${mulish.variable} antialiased`}>
{children}
<script

2
src/app/page.tsx
View File

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

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-inter), sans-serif;
font-family: var(--font-mulish), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-libre-baskerville), serif;
font-family: var(--font-nunito), sans-serif;
}