Merge version_7 into main

Update src/app/page.tsx
2026-06-09 19:15:48 +00:00 · 2026-06-09 19:15:45 +00:00 · 2026-06-09 19:13:49 +00:00 · 2026-06-09 19:13:46 +00:00 · 2026-06-09 19:13:46 +00:00 · 2026-06-09 18:38:00 +00:00
3 changed files with 22 additions and 6 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,12 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Archivo } from "next/font/google";
+import { Montserrat } from "next/font/google";
+import { Roboto } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";
+import { Public_Sans } from "next/font/google";
+import { Manrope } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -41,8 +47,18 @@ export const metadata: Metadata = {
  },
 };

-const archivo = Archivo({
-  variable: "--font-archivo",  subsets: ["latin"]
+
+
+
+
+
+const manrope = Manrope({
+  variable: "--font-manrope",
+  subsets: ["latin"],
+});
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
 });

 export default function RootLayout({
@@ -53,7 +69,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${archivo.variable} antialiased`}>
+        <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -203,4 +203,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-archivo), 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-archivo), sans-serif;
+  font-family: var(--font-manrope), sans-serif;
 }
Author	SHA1	Message	Date
bender	72f3c4e0e5	Merge version_7 into main Merge version_7 into main	2026-06-09 19:15:48 +00:00
bender	b745579c12	Update src/app/page.tsx	2026-06-09 19:15:45 +00:00
bender	1eb5b20882	Merge version_6 into main Merge version_6 into main	2026-06-09 19:13:49 +00:00
bender	b0def99271	Update theme fonts	2026-06-09 19:13:46 +00:00
bender	51e4c2941e	Update theme fonts	2026-06-09 19:13:46 +00:00
bender	ca0faf702e	Merge version_6 into main Merge version_6 into main	2026-06-09 18:38:00 +00:00
bender	842e2a74a3	Update theme fonts	2026-06-09 18:37:57 +00:00
bender	8fadd54ad2	Update theme fonts	2026-06-09 18:37:56 +00:00
bender	0990f2ff3c	Merge version_6 into main Merge version_6 into main	2026-06-09 18:37:52 +00:00
bender	e07ea8d9e3	Update theme fonts	2026-06-09 18:37:49 +00:00
bender	240ed18582	Update theme fonts	2026-06-09 18:37:48 +00:00
bender	d8181f711a	Merge version_6 into main Merge version_6 into main	2026-06-09 18:37:45 +00:00
bender	146bdad100	Update theme fonts	2026-06-09 18:37:41 +00:00
bender	cda5b45e67	Update theme fonts	2026-06-09 18:37:41 +00:00
bender	dbba7aa60d	Merge version_6 into main Merge version_6 into main	2026-06-09 18:37:23 +00:00
bender	c360acd93a	Update theme fonts	2026-06-09 18:37:20 +00:00
bender	ab813d17a4	Update theme fonts	2026-06-09 18:37:19 +00:00
bender	71906de3d9	Merge version_6 into main Merge version_6 into main	2026-06-09 18:37:13 +00:00
bender	99498fc955	Update theme colors	2026-06-09 18:37:10 +00:00
bender	ec696900cf	Merge version_5 into main Merge version_5 into main	2026-06-09 18:36:59 +00:00
bender	eb568cca7d	Update theme colors	2026-06-09 18:36:56 +00:00
bender	767978f419	Merge version_3 into main Merge version_3 into main	2026-06-09 18:36:55 +00:00
bender	e5577ab5aa	Update theme colors	2026-06-09 18:36:52 +00:00
bender	3290bc341e	Update theme colors	2026-06-09 18:36:49 +00:00
bender	0f55a38fb9	Merge version_2 into main Merge version_2 into main	2026-06-09 18:36:40 +00:00
bender	c78b2c9f93	Merge version_1 into main Merge version_1 into main	2026-06-09 15:35:20 +00:00