67 Commits

Author SHA1 Message Date
2f4a18ea9e Merge version_37 into main
Merge version_37 into main
2026-06-08 08:02:07 +00:00
d5b6a32dd2 Update theme colors 2026-06-08 08:02:04 +00:00
48007b7afc Merge version_36 into main
Merge version_36 into main
2026-06-08 08:01:44 +00:00
809e5bbd2b Update theme colors 2026-06-08 08:01:37 +00:00
5193f4e9b3 Merge version_35 into main
Merge version_35 into main
2026-06-08 07:57:00 +00:00
c8e2b4f6a3 Update theme fonts 2026-06-08 07:56:57 +00:00
3c9a0a143e Update theme fonts 2026-06-08 07:56:56 +00:00
263fe95d61 Merge version_35 into main
Merge version_35 into main
2026-06-08 07:51:20 +00:00
7f7f259be0 Update theme colors 2026-06-08 07:51:17 +00:00
7a0bf54918 Merge version_34 into main
Merge version_34 into main
2026-06-08 07:51:02 +00:00
be186d467d Update theme colors 2026-06-08 07:50:56 +00:00
94e66148d3 Merge version_33 into main
Merge version_33 into main
2026-06-08 07:50:44 +00:00
92513dc17f Update theme colors 2026-06-08 07:50:41 +00:00
2985331bc5 Merge version_32 into main
Merge version_32 into main
2026-06-08 07:50:00 +00:00
edb5c31a0d Update theme colors 2026-06-08 07:49:57 +00:00
87524a21e9 Merge version_31 into main
Merge version_31 into main
2026-06-08 07:49:32 +00:00
3bd86b95eb Update theme colors 2026-06-08 07:49:28 +00:00
6cf2327424 Merge version_30 into main
Merge version_30 into main
2026-06-08 07:48:48 +00:00
95ee2629de Update theme colors 2026-06-08 07:48:42 +00:00
0375b75c03 Merge version_29 into main
Merge version_29 into main
2026-06-08 07:47:53 +00:00
1e6d21a24d Update theme colors 2026-06-08 07:47:50 +00:00
a29f6a1a9a Merge version_28 into main
Merge version_28 into main
2026-06-08 07:42:03 +00:00
0a174ebda8 Update theme colors 2026-06-08 07:41:59 +00:00
133d078b91 Merge version_27 into main
Merge version_27 into main
2026-06-08 07:41:47 +00:00
7b2c0c6e3a Update theme colors 2026-06-08 07:41:44 +00:00
81e9d84715 Merge version_26 into main
Merge version_26 into main
2026-06-08 07:41:34 +00:00
c8869ea3ea Update theme colors 2026-06-08 07:41:31 +00:00
2f1effcfd4 Merge version_25 into main
Merge version_25 into main
2026-06-08 07:40:44 +00:00
354d5c54cb Update theme colors 2026-06-08 07:40:40 +00:00
f169c922ed Merge version_24 into main
Merge version_24 into main
2026-06-08 07:40:29 +00:00
c103b0f9b4 Update theme colors 2026-06-08 07:40:26 +00:00
bc2e5d78ce Merge version_23 into main
Merge version_23 into main
2026-06-08 07:40:02 +00:00
a1714f4a0a Update theme colors 2026-06-08 07:39:58 +00:00
e26752ad85 Merge version_22 into main
Merge version_22 into main
2026-06-08 07:39:54 +00:00
c71b954ad8 Update theme colors 2026-06-08 07:39:48 +00:00
74329b4ffd Merge version_21 into main
Merge version_21 into main
2026-06-08 07:39:38 +00:00
2fe45b6f2c Update theme colors 2026-06-08 07:39:35 +00:00
3dfe73ffc8 Merge version_20 into main
Merge version_20 into main
2026-06-08 07:39:26 +00:00
70553c2672 Update theme colors 2026-06-08 07:39:23 +00:00
0fec9f5515 Merge version_19 into main
Merge version_19 into main
2026-06-08 07:39:02 +00:00
ed9a1ebf01 Update theme colors 2026-06-08 07:38:59 +00:00
feba8ebd6f Merge version_18 into main
Merge version_18 into main
2026-06-08 07:38:57 +00:00
6881381f33 Update theme colors 2026-06-08 07:38:54 +00:00
8cc1f63444 Merge version_17 into main
Merge version_17 into main
2026-06-08 07:38:48 +00:00
11e36995d3 Update theme colors 2026-06-08 07:38:45 +00:00
173fda0dd8 Merge version_16 into main
Merge version_16 into main
2026-06-08 07:38:43 +00:00
32919f14be Update theme colors 2026-06-08 07:38:39 +00:00
be9e174ad5 Merge version_15 into main
Merge version_15 into main
2026-06-08 07:38:39 +00:00
6a3b20da03 Update theme colors 2026-06-08 07:38:33 +00:00
ba83aa7cbc Merge version_14 into main
Merge version_14 into main
2026-06-08 07:36:57 +00:00
261c568d02 Update theme colors 2026-06-08 07:36:51 +00:00
89de47688d Merge version_13 into main
Merge version_13 into main
2026-06-08 07:36:44 +00:00
24d0144a16 Update theme colors 2026-06-08 07:36:41 +00:00
8852324bcf Merge version_12 into main
Merge version_12 into main
2026-06-08 07:36:21 +00:00
917868a67f Update theme colors 2026-06-08 07:36:17 +00:00
8ae3f35469 Merge version_11 into main
Merge version_11 into main
2026-06-08 07:36:04 +00:00
ea28cac0ca Update theme colors 2026-06-08 07:36:01 +00:00
a6a912199c Merge version_10 into main
Merge version_10 into main
2026-06-08 07:35:44 +00:00
2a522c507a Update theme colors 2026-06-08 07:35:41 +00:00
ba166ed3e8 Merge version_9 into main
Merge version_9 into main
2026-06-08 07:35:11 +00:00
ac9c3600d2 Update theme colors 2026-06-08 07:35:07 +00:00
2f339be5a3 Merge version_8 into main
Merge version_8 into main
2026-06-08 07:34:42 +00:00
71276e16b1 Update theme colors 2026-06-08 07:34:38 +00:00
62da43b41d Merge version_7 into main
Merge version_7 into main
2026-06-08 07:34:12 +00:00
f3305b5132 Merge version_6 into main
Merge version_6 into main
2026-06-08 07:31:55 +00:00
785636a173 Merge version_5 into main
Merge version_5 into main
2026-06-08 07:30:20 +00:00
d342cacd2e Merge version_4 into main
Merge version_4 into main
2026-06-07 20:25:01 +00:00
3 changed files with 16 additions and 14 deletions

View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -42,12 +43,13 @@ export const metadata: Metadata = {
},
};
const manrope = Manrope({
variable: "--font-manrope",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
@@ -59,7 +61,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${manrope.variable} ${dmSans.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-dm-sans), 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,13 +10,13 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f5f5;
--card: #1a1a1a;
--foreground: #f5f5f5;
--primary-cta: #2bac9e;
--primary-cta-text: #ffffff;
--secondary-cta: #e8e4e4;
--secondary-cta-text: #ffffff;
--background: #111111;
--card: #adc9cd;
--foreground: #FFFFFf;
--primary-cta: #FF6B35;
--primary-cta-text: #FFFFFF;
--secondary-cta: #2D2D2D;
--secondary-cta-text: #FFFFFF;
--accent: #991b1b;
--background-accent: #7f1d1d;