6 Commits

Author SHA1 Message Date
9e7200a771 Merge version_2 into main
Merge version_2 into main
2026-03-28 11:15:35 +00:00
eb2495b790 Update src/app/styles/base.css 2026-03-28 11:15:32 +00:00
cc0b1ebdcf Update src/app/page.tsx 2026-03-28 11:15:32 +00:00
ff8e145540 Update src/app/layout.tsx 2026-03-28 11:15:31 +00:00
ba2c9eda16 Merge version_1 into main
Merge version_1 into main
2026-03-28 11:12:35 +00:00
2ed09e99ec Merge version_1 into main
Merge version_1 into main
2026-03-28 11:06:36 +00:00
3 changed files with 8 additions and 11 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Mulish } from "next/font/google";
import { Archivo } from "next/font/google";
@@ -21,13 +22,9 @@ export const metadata: Metadata = {
},
};
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"],
});
export default function RootLayout({
@@ -38,7 +35,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<body className={`${archivo.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -201,4 +201,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-archivo), 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-archivo), sans-serif;
}