6 Commits

Author SHA1 Message Date
6d24b02453 Merge version_2 into main
Merge version_2 into main
2026-05-12 21:24:56 +00:00
e37e472a97 Update theme fonts 2026-05-12 21:24:53 +00:00
8d78bb6592 Update theme fonts 2026-05-12 21:24:52 +00:00
c9178a66b5 Merge version_2 into main
Merge version_2 into main
2026-05-12 21:24:48 +00:00
072ca47c56 Update theme colors 2026-05-12 21:24:44 +00:00
4a9a1d52ea Merge version_1 into main
Merge version_1 into main
2026-05-12 21:21:35 +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 { Nunito_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -20,8 +21,14 @@ export const metadata: Metadata = {
},
};
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans",
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -33,7 +40,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${nunitoSans.variable} antialiased`}>
<body className={`${libreBaskerville.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-nunito-sans), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-nunito-sans), sans-serif;
font-family: var(--font-libre-baskerville), serif;
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #efebe5;
--card: #f7f2ea;
--foreground: #000000;
--primary-cta: #000000;
--primary-cta-text: #efebe5;
--secondary-cta: #ffffff;
--secondary-cta-text: #000000;
--accent: #ffffff;
--background-accent: #e1b875;
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #fffffae6;
--primary-cta: #fde047;
--primary-cta-text: #0a0a0a;
--secondary-cta: #1a1a1a;
--secondary-cta-text: #fffffae6;
--accent: #737373;
--background-accent: #737373;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);