bender/3a5e57b5-9847-427b-b4b1-461bdb43b0d4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_3
Branches Tags
bender:main bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
..
compare: bender:main
Branches Tags
bender:main bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

14 Commits
version_3 ... main

Author SHA1 Message Date
bender
43d07d448a Merge version_5 into main 
Merge version_5 into main
 2026-05-09 18:36:13 +00:00
bender
c4f20faba5 Update theme fonts 2026-05-09 18:36:10 +00:00
bender
db9d0a41e0 Update theme fonts 2026-05-09 18:36:10 +00:00
bender
cbff6ab7be Merge version_5 into main 
Merge version_5 into main
 2026-05-09 18:36:00 +00:00
bender
133b4be6fa Update theme fonts 2026-05-09 18:35:56 +00:00
bender
8b07c94d0d Update theme fonts 2026-05-09 18:35:56 +00:00
bender
4c1d0af49f Merge version_5 into main 
Merge version_5 into main
 2026-05-09 18:35:36 +00:00
bender
ce1b1c8f6a Update theme fonts 2026-05-09 18:35:30 +00:00
bender
857c4bd89a Update theme fonts 2026-05-09 18:35:30 +00:00
bender
3f82137880 Merge version_5 into main 
Merge version_5 into main
 2026-05-09 18:33:35 +00:00
bender
d7cb05b7da Update theme colors 2026-05-09 18:33:31 +00:00
bender
e4ca9517a1 Merge version_4 into main 
Merge version_4 into main
 2026-05-09 18:33:15 +00:00
bender
43fd7b82eb Update theme colors 2026-05-09 18:33:12 +00:00
bender
87a6f62a08 Merge version_3 into main 
Merge version_3 into main
 2026-05-09 18:31:47 +00:00
3 changed files with 24 additions and 14 deletions
Expand all files Collapse all files

18
src/app/layout.tsx
View File

@@ -7,6 +7,9 @@ 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 { Poppins } from "next/font/google"; import { Poppins } from "next/font/google";
import { Raleway } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
@@ -20,10 +23,17 @@ export const metadata: Metadata = {
}, },
}; };
const poppins = Poppins({
variable: "--font-poppins",
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -34,7 +44,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${poppins.variable} antialiased`}> <body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

4
src/app/styles/base.css
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-poppins), sans-serif; font-family: var(--font-inter), 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-poppins), sans-serif; font-family: var(--font-libre-baskerville), serif;
} }

16
src/app/styles/variables.css
View File

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #fdf2f8; --background: #ffffff;
--card: #ffffff; --card: #f9f9f9;
--foreground: #4c0519; --foreground: #000f06e6;
--primary-cta: #db2777; --primary-cta: #0a7039;
--primary-cta-text: #ffffff; --primary-cta-text: #ffffff;
--secondary-cta: #fce7f3; --secondary-cta: #f9f9f9;
--secondary-cta-text: #000612e6; --secondary-cta-text: #000f06e6;
--accent: #fbcfe8; --accent: #e2e2e2;
--background-accent: #f9a8d4; --background-accent: #c4c4c4;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);