13 Commits

Author SHA1 Message Date
34bb2e2b0d Merge version_4 into main
Merge version_4 into main
2026-04-21 21:01:51 +00:00
deb7fd8ab5 Update theme fonts 2026-04-21 21:01:48 +00:00
5458c97a60 Update theme fonts 2026-04-21 21:01:48 +00:00
5480711f9d Merge version_4 into main
Merge version_4 into main
2026-04-21 21:01:32 +00:00
bd07a15d8c Update theme colors 2026-04-21 21:01:29 +00:00
7a2c019ad5 Merge version_3 into main
Merge version_3 into main
2026-04-21 21:00:51 +00:00
995d732182 Update theme fonts 2026-04-21 21:00:48 +00:00
14f0966b26 Update theme fonts 2026-04-21 21:00:47 +00:00
23d4066b5e Merge version_3 into main
Merge version_3 into main
2026-04-21 21:00:02 +00:00
0d440f9eed Update theme colors 2026-04-21 20:59:56 +00:00
096d33f2a6 Merge version_2 into main
Merge version_2 into main
2026-04-21 20:59:39 +00:00
455776d2e7 Update theme colors 2026-04-21 20:59:36 +00:00
b9491c9f0e Merge version_1 into main
Merge version_1 into main
2026-04-21 20:58:26 +00:00
3 changed files with 20 additions and 16 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 { Open_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Mulish } from "next/font/google";
@@ -20,12 +22,14 @@ export const metadata: Metadata = {
},
};
const inter = Inter({
variable: "--font-inter",
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -37,7 +41,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<body className={`${mulish.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-open-sans), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter), sans-serif;
font-family: var(--font-mulish), sans-serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #FAFAFA;
--card: #F5E9DA;
--foreground: #0D0D0D;
--primary-cta: #0D0D0D;
--primary-cta-text: #FAFAFA;
--secondary-cta: #C8A96A;
--secondary-cta-text: #0D0D0D;
--accent: #C8A96A;
--background-accent: #F5E9DA;
--background: #efebe5;
--card: #f7f2ea;
--foreground: #000000;
--primary-cta: #000000;
--primary-cta-text: #efebe5;
--secondary-cta: #ffffff;
--secondary-cta-text: #000000;
--accent: #ffffff;
--background-accent: #e1b875;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);