8 Commits

Author SHA1 Message Date
b305ddbfd8 Merge version_6 into main
Merge version_6 into main
2026-06-10 19:26:13 +00:00
c7dfd1fc06 Update theme fonts 2026-06-10 19:26:10 +00:00
acec90db5e Update theme fonts 2026-06-10 19:26:10 +00:00
b711c55ba5 Merge version_6 into main
Merge version_6 into main
2026-06-10 19:25:36 +00:00
69df903075 Update theme colors 2026-06-10 19:25:33 +00:00
e4f28bc031 Merge version_5 into main
Merge version_5 into main
2026-06-10 19:25:29 +00:00
10e2dba47e Update theme colors 2026-06-10 19:25:26 +00:00
585ae89bdb Merge version_4 into main
Merge version_4 into main
2026-06-10 19:23:25 +00:00
3 changed files with 21 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 { Archivo } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -33,8 +34,14 @@ export const metadata: Metadata = {
},
};
const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"]
const montserrat = Montserrat({
variable: "--font-montserrat",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
@@ -45,7 +52,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${archivo.variable} antialiased`}>
<body className={`${montserrat.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-font-family: var(--font-archivo), sans-serif;), sans-serif;
font-family: var(--font-inter), sans-serif;), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-font-family: var(--font-archivo), sans-serif;), sans-serif;
font-family: var(--font-montserrat), sans-serif;), sans-serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #FFFFFF;
--card: #F8F8F8;
--foreground: #000000;
--primary-cta: #FFD700;
--primary-cta-text: #000000;
--secondary-cta: #36454F;
--secondary-cta-text: #FFFFFF;
--accent: #36454F;
--background-accent: #E0E0E0;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #f5f5f5;
--primary-cta: #dfff1c;
--primary-cta-text: #0a0a0a;
--secondary-cta: #1a1a1a;
--secondary-cta-text: #ffffff;
--accent: #8b9a1b;
--background-accent: #5d6b00;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);