21 Commits

Author SHA1 Message Date
4d1ebc0451 Merge version_4 into main
Merge version_4 into main
2026-04-29 16:24:55 +00:00
a2f02eaaa3 Update theme fonts 2026-04-29 16:24:51 +00:00
6171e876ab Update theme fonts 2026-04-29 16:24:51 +00:00
3d850eb10a Merge version_4 into main
Merge version_4 into main
2026-04-29 16:23:55 +00:00
9989fe8f14 Update theme fonts 2026-04-29 16:23:52 +00:00
8ac9eb413b Update theme fonts 2026-04-29 16:23:52 +00:00
07328e85f2 Merge version_4 into main
Merge version_4 into main
2026-04-29 16:23:50 +00:00
14c89d367e Update theme fonts 2026-04-29 16:23:44 +00:00
62accbadf7 Update theme fonts 2026-04-29 16:23:44 +00:00
b7fe5144c7 Merge version_4 into main
Merge version_4 into main
2026-04-29 16:22:36 +00:00
4996209332 Update theme fonts 2026-04-29 16:22:32 +00:00
0333a286e7 Update theme fonts 2026-04-29 16:22:32 +00:00
633c0a0b1c Merge version_4 into main
Merge version_4 into main
2026-04-29 16:22:19 +00:00
e10a701d51 Update theme fonts 2026-04-29 16:22:16 +00:00
5672b7a4ca Update theme fonts 2026-04-29 16:22:16 +00:00
d023a55c78 Merge version_4 into main
Merge version_4 into main
2026-04-29 16:21:00 +00:00
9d86bdcf61 Update theme colors 2026-04-29 16:20:57 +00:00
61e147a141 Merge version_3 into main
Merge version_3 into main
2026-04-29 16:20:45 +00:00
21b8fca4b0 Update theme colors 2026-04-29 16:20:42 +00:00
956cd83c03 Merge version_2 into main
Merge version_2 into main
2026-04-29 16:19:53 +00:00
3709c4ab13 Merge version_2 into main
Merge version_2 into main
2026-04-29 16:19:17 +00:00
2 changed files with 18 additions and 6 deletions

View File

@@ -7,6 +7,10 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Lato } from "next/font/google";
import { Nunito } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Archivo } from "next/font/google";
@@ -21,10 +25,18 @@ export const metadata: Metadata = {
},
};
const lato = Lato({
variable: "--font-lato",
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
export default function RootLayout({
@@ -35,7 +47,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${lato.variable} antialiased`}>
<body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-lato), 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-lato), sans-serif;
font-family: var(--font-manrope), sans-serif;
}