Merge version_3 into main #3

Merged
bender merged 3 commits from version_3 into main 2026-06-11 18:44:18 +00:00
3 changed files with 14 additions and 9 deletions

View File

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

View File

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

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