16 Commits

Author SHA1 Message Date
aa321d800f Merge version_10 into main
Merge version_10 into main
2026-06-03 19:05:02 +00:00
551603bdc5 Merge version_10 into main
Merge version_10 into main
2026-06-03 19:04:58 +00:00
65253766db Update theme fonts 2026-06-03 19:04:58 +00:00
e53a398525 Update theme fonts 2026-06-03 19:04:57 +00:00
df926fcf90 Update theme colors 2026-06-03 19:04:52 +00:00
c47670cbc0 Merge version_9 into main
Merge version_9 into main
2026-06-03 19:04:44 +00:00
4620c63aee Update theme colors 2026-06-03 19:04:38 +00:00
ace086d57a Merge version_8 into main
Merge version_8 into main
2026-06-03 19:04:35 +00:00
8247acf832 Update theme colors 2026-06-03 19:04:32 +00:00
5ecde5eb78 Merge version_7 into main
Merge version_7 into main
2026-06-03 19:04:28 +00:00
649d035f86 Update theme colors 2026-06-03 19:04:25 +00:00
951da5d532 Merge version_6 into main
Merge version_6 into main
2026-06-03 19:04:09 +00:00
b300af3c41 Update theme colors 2026-06-03 19:04:06 +00:00
930221de18 Merge version_5 into main
Merge version_5 into main
2026-06-03 19:03:55 +00:00
f6ca5cd5e2 Update theme colors 2026-06-03 19:03:52 +00:00
be388e43b1 Merge version_4 into main
Merge version_4 into main
2026-06-03 19:01:13 +00:00
3 changed files with 17 additions and 11 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Nunito } from "next/font/google"; import { Nunito } from "next/font/google";
import { Open_Sans } from "next/font/google";
@@ -41,8 +42,13 @@ export const metadata: Metadata = {
}, },
}; };
const nunito = Nunito({
variable: "--font-nunito", const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -54,7 +60,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${nunito.variable} antialiased`}> <body className={`${inter.variable} ${openSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

View File

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

View File

@@ -10,12 +10,12 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #eff2f6; --background: #384659;
--card: #ffffff; --card: #f62727;
--foreground: #2a2a2a; --foreground: #29dfee;
--primary-cta: #9B59B6; --primary-cta: #b83fe7;
--primary-cta-text: #ffffff; --primary-cta-text: #000000;
--secondary-cta: #e0e0e0; --secondary-cta: #20230e;
--secondary-cta-text: #2a2a2a; --secondary-cta-text: #2a2a2a;
--accent: #d8bfd8; --accent: #d8bfd8;
--background-accent: #d1d8e0; --background-accent: #d1d8e0;