bender/7bd5bf6b-ffa9-4849-9c23-3731eefe54fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

6 Commits
version_2 ... main

Author SHA1 Message Date
bender
a805df52ad Merge version_3 into main 
Merge version_3 into main
 2026-04-17 09:28:08 +00:00
bender
5ffc0332df Update src/app/page.tsx 2026-04-17 09:28:05 +00:00
bender
d454240982 Merge version_3 into main 
Merge version_3 into main
 2026-04-10 09:58:15 +00:00
bender
5115af7bcf Update theme fonts 2026-04-10 09:58:12 +00:00
bender
cb713aeb50 Update theme fonts 2026-04-10 09:58:11 +00:00
bender
d192f30515 Merge version_2 into main 
Merge version_2 into main
 2026-04-10 09:57:58 +00:00
3 changed files with 15 additions and 6 deletions
Expand all files Collapse all files

13
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 { Mulish } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -20,8 +21,14 @@ export const metadata: Metadata = {
},
};
const mulish = Mulish({
variable: "--font-mulish",
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -33,7 +40,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} antialiased`}>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
{children}
<script

4
src/app/page.tsx
View File

@@ -49,7 +49,9 @@ export default function LandingPage() {
name: "Contact",
id: "contact",
},
]}
{ name: "Blog", id: "/blog" },
]}
brandName="Happy Paws Shelter"
/>
</div>

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-mulish), 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-mulish), sans-serif;
font-family: var(--font-libre-baskerville), serif;
}