16 Commits

Author SHA1 Message Date
522fda9f27 Merge version_13 into main
Merge version_13 into main
2026-06-07 17:31:05 +00:00
1bd9f0b9a6 Update theme fonts 2026-06-07 17:30:59 +00:00
94c019b94c Update theme fonts 2026-06-07 17:30:58 +00:00
2dc7fc2acd Merge version_13 into main
Merge version_13 into main
2026-06-07 17:28:59 +00:00
2f4ad4b78d Update theme colors 2026-06-07 17:28:56 +00:00
d60acc2f8e Merge version_12 into main
Merge version_12 into main
2026-06-07 17:28:46 +00:00
48d94a2fff Update theme colors 2026-06-07 17:28:40 +00:00
3dbc6c47a0 Merge version_11 into main
Merge version_11 into main
2026-06-07 17:28:34 +00:00
ca446222d0 Merge version_10 into main
Merge version_10 into main
2026-06-07 17:00:51 +00:00
78735c85ea Merge version_9 into main
Merge version_9 into main
2026-06-07 17:00:46 +00:00
35b3950382 Merge version_8 into main
Merge version_8 into main
2026-06-07 16:58:54 +00:00
6e380e0eca Merge version_7 into main
Merge version_7 into main
2026-06-07 16:55:38 +00:00
b64e853374 Merge version_6 into main
Merge version_6 into main
2026-06-07 16:55:27 +00:00
90c5cb28ba Merge version_6 into main
Merge version_6 into main
2026-06-07 16:40:14 +00:00
0343365031 Merge version_5 into main
Merge version_5 into main
2026-06-07 16:39:51 +00:00
09cd499089 Merge version_4 into main
Merge version_4 into main
2026-06-07 16:38:28 +00:00
3 changed files with 20 additions and 14 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 { Manrope } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -41,8 +42,13 @@ export const metadata: Metadata = {
},
};
const manrope = Manrope({
variable: "--font-manrope",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
@@ -54,7 +60,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} antialiased`}>
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag />
{children}
<script

View File

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

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f5f5;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #1c1c1c;
--primary-cta-text: #f5f5f5;
--secondary-cta: #ffffff;
--secondary-cta-text: #1c1c1c;
--accent: #159c49;
--background-accent: #a8e8ba;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #ffffffe6;
--primary-cta: #e6e6e6;
--primary-cta-text: #0a0a0a;
--secondary-cta: #1a1a1a;
--secondary-cta-text: #ffffffe6;
--accent: #737373;
--background-accent: #737373;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);