12 Commits

Author SHA1 Message Date
f0b3422fea Merge version_3 into main
Merge version_3 into main
2026-05-17 17:19:02 +00:00
e846860812 Update theme fonts 2026-05-17 17:18:59 +00:00
6c940c6ee1 Update theme fonts 2026-05-17 17:18:59 +00:00
f9acfe65b0 Merge version_3 into main
Merge version_3 into main
2026-05-17 17:18:51 +00:00
0d035bd9ea Update theme fonts 2026-05-17 17:18:48 +00:00
f3d7691136 Update theme fonts 2026-05-17 17:18:47 +00:00
ce2632bd7f Merge version_3 into main
Merge version_3 into main
2026-05-17 17:08:39 +00:00
0823553273 Update theme colors 2026-05-17 17:08:36 +00:00
bd5689be9b Merge version_2 into main
Merge version_2 into main
2026-05-17 17:08:31 +00:00
79181e2d6f Merge version_1 into main
Merge version_1 into main
2026-05-17 17:07:27 +00:00
db10dbac9b Merge version_1 into main
Merge version_1 into main
2026-05-17 17:07:12 +00:00
28566b326d Merge version_1 into main
Merge version_1 into main
2026-05-17 17:06:54 +00:00
3 changed files with 9 additions and 5 deletions

View File

@@ -8,6 +8,8 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google"; import { Public_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Inter_Tight } from "next/font/google";
import { Mulish } from "next/font/google";
@@ -26,8 +28,10 @@ export const metadata: Metadata = {
const dmSans = DM_Sans({
variable: "--font-dm-sans",
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"], subsets: ["latin"],
}); });
const inter = Inter({ const inter = Inter({
@@ -43,7 +47,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${mulish.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

View File

@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-dm-sans), sans-serif; font-family: var(--font-mulish), sans-serif;
} }

View File

@@ -10,7 +10,7 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #f6f0e9; --background: #d07206;
--card: #efe7dd; --card: #efe7dd;
--foreground: #2b180a; --foreground: #2b180a;
--primary-cta: #88491c; --primary-cta: #88491c;