bender/4365fc0e-9151-4c4d-b4bd-1a9d7b267177
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:version_3
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

4 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
c1284f5765 Update src/app/styles/base.css 2026-06-11 18:44:14 +00:00
bender
49d0570a49 Update src/app/page.tsx 2026-06-11 18:44:14 +00:00
bender
809bc2aa48 Update src/app/layout.tsx 2026-06-11 18:44:13 +00:00
bender
eb5b048724 Merge version_2 into main 
Merge version_2 into main
 2026-06-11 18:41:53 +00:00
3 changed files with 14 additions and 9 deletions
Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -7,6 +7,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Montserrat } from "next/font/google"; import { Montserrat } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -41,9 +43,12 @@ export const metadata: Metadata = {
}, },
}; };
const montserrat = Montserrat({
variable: "--font-montserrat", const manrope = Manrope({
subsets: ["latin"], variable: "--font-manrope", subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -54,7 +59,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${montserrat.variable} antialiased`}> <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

4
src/app/page.tsx
View File

@@ -67,8 +67,8 @@ export default function LandingPage() {
{ {
text: "Learn More", href: "#about"}, text: "Learn More", href: "#about"},
]} ]}
imageSrc="http://img.b2bpic.net/free-photo/courier-doing-jobs-logistics_23-2149229212.jpg" imageSrc="http://img.b2bpic.net/free-photo/courier-doing-jobs-logistics_23-2149229199.jpg"
imageAlt="Delivery van driving through a UK city street" imageAlt="Courier delivering parcels"
/> />
</div> </div>

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

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