25 Commits

Author SHA1 Message Date
cec5b8c579 Merge version_18 into main
Merge version_18 into main
2026-04-23 07:48:39 +00:00
8dcd07f5ec Update theme colors 2026-04-23 07:48:36 +00:00
c9eec2752f Merge version_17 into main
Merge version_17 into main
2026-04-23 07:48:21 +00:00
b0996b6a9e Update theme fonts 2026-04-23 07:48:18 +00:00
d916a4d1a4 Update theme fonts 2026-04-23 07:48:18 +00:00
50bd1a9ccc Merge version_17 into main
Merge version_17 into main
2026-04-23 07:47:56 +00:00
74cedc7bf6 Update theme colors 2026-04-23 07:47:52 +00:00
891dc80a99 Merge version_16 into main
Merge version_16 into main
2026-04-23 07:47:21 +00:00
06097125fd Update theme colors 2026-04-23 07:47:15 +00:00
9beb925d32 Merge version_15 into main
Merge version_15 into main
2026-04-23 07:46:55 +00:00
b5b6bd6b4a Update theme colors 2026-04-23 07:46:52 +00:00
c808d9c7d2 Merge version_14 into main
Merge version_14 into main
2026-04-23 07:46:45 +00:00
a05b2785ae Merge version_13 into main
Merge version_13 into main
2026-04-23 07:46:42 +00:00
98d1c31676 Merge version_12 into main
Merge version_12 into main
2026-04-23 07:46:01 +00:00
0c7a3f595c Merge version_11 into main
Merge version_11 into main
2026-04-23 07:45:39 +00:00
b30b5467d2 Merge version_11 into main
Merge version_11 into main
2026-04-23 07:44:31 +00:00
c6ae8a8ccb Merge version_10 into main
Merge version_10 into main
2026-04-23 07:44:11 +00:00
2cb9e18343 Merge version_9 into main
Merge version_9 into main
2026-04-23 07:43:31 +00:00
34dea54c1c Merge version_8 into main
Merge version_8 into main
2026-04-23 07:43:05 +00:00
ef1b6ee8c3 Merge version_7 into main
Merge version_7 into main
2026-04-23 07:42:35 +00:00
7d605f8813 Merge version_6 into main
Merge version_6 into main
2026-04-23 07:42:08 +00:00
ad39b34554 Merge version_5 into main
Merge version_5 into main
2026-04-23 07:41:37 +00:00
baba5c6a0b Merge version_4 into main
Merge version_4 into main
2026-04-23 07:41:19 +00:00
117df7cd62 Merge version_3 into main
Merge version_3 into main
2026-04-23 07:41:15 +00:00
b46c1eeac0 Merge version_2 into main
Merge version_2 into main
2026-04-23 07:40:46 +00:00
3 changed files with 17 additions and 18 deletions

View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Source_Sans_3 } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -22,13 +23,11 @@ export const metadata: Metadata = {
};
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -39,7 +38,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${poppins.variable} antialiased`}>
<Tag />
{children}
<script

View File

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

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #000802;
--card: #0b1a0b;
--foreground: #e6ffe6;
--primary-cta: #80da9b;
--primary-cta-text: #000802;
--secondary-cta: #07170b;
--secondary-cta-text: #e6ffe6;
--accent: #38714a;
--background-accent: #2c6541;
--background: #ffffff;
--card: #f9f9f9;
--foreground: #000612e6;
--primary-cta: #106EFB;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #000612e6;
--accent: #e2e2e2;
--background-accent: #106EFB;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);