11 Commits

Author SHA1 Message Date
3356d3b3f8 Merge version_8 into main
Merge version_8 into main
2026-06-05 10:18:58 +00:00
8e553b7754 Update src/app/styles/variables.css 2026-06-05 10:18:55 +00:00
3c7bbd3d32 Merge version_7 into main
Merge version_7 into main
2026-06-05 10:16:40 +00:00
18d3d0af91 Update theme fonts 2026-06-05 10:16:37 +00:00
2cca9eba9a Update theme fonts 2026-06-05 10:16:37 +00:00
222e5114b2 Merge version_7 into main
Merge version_7 into main
2026-06-05 10:15:51 +00:00
0c9062a66f Update theme colors 2026-06-05 10:15:47 +00:00
abf58b5cc1 Merge version_6 into main
Merge version_6 into main
2026-06-05 10:15:42 +00:00
3b362aea89 Merge version_5 into main
Merge version_5 into main
2026-06-05 10:15:02 +00:00
327b35a662 Merge version_4 into main
Merge version_4 into main
2026-06-05 10:14:33 +00:00
5948092877 Merge version_3 into main
Merge version_3 into main
2026-06-05 09:28:28 +00:00
3 changed files with 17 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 { Montserrat } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -41,9 +42,11 @@ export const metadata: Metadata = {
},
};
const montserrat = Montserrat({
variable: "--font-montserrat",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -54,7 +57,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${montserrat.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-montserrat), 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-montserrat), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #ffffff;
--card: #f9f9f9;
--foreground: #0c1200;
--primary-cta: #15479c;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #000612e6;
--accent: #e2e2e2;
--background-accent: #c4c4c4;
--background: #FFFFE0;
--card: #FFFBF0;
--foreground: #333333;
--primary-cta: #FFD700;
--primary-cta-text: #000000;
--secondary-cta: #FDF2E3;
--secondary-cta-text: #333333;
--accent: #FFEC8B;
--background-accent: #FFF8E1;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);