bender/56a8b99b-2f4b-49bf-9dc4-ebcde61cf5f1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

6 Commits
version_1 ... main

Author SHA1 Message Date
bender
40521827f2 Merge version_2 into main 
Merge version_2 into main
 2026-05-19 17:07:22 +00:00
bender
d5d43d5869 Update theme fonts 2026-05-19 17:07:19 +00:00
bender
c4bdc3948c Update theme fonts 2026-05-19 17:07:19 +00:00
bender
6b115d5643 Merge version_2 into main 
Merge version_2 into main
 2026-05-19 17:07:17 +00:00
bender
c14bd0dd72 Update theme colors 2026-05-19 17:07:14 +00:00
bender
26475dc8a4 Merge version_1 into main 
Merge version_1 into main
 2026-04-27 04:11:00 +00:00
3 changed files with 18 additions and 15 deletions
Expand all files Collapse all files

13
src/app/layout.tsx
View File

@@ -7,6 +7,8 @@ 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 { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
@@ -29,12 +31,13 @@ export const metadata: Metadata = {
}, },
}; };
const inter = Inter({
variable: "--font-inter", const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"], subsets: ["latin"],
}); });
const openSans = Open_Sans({ const dmSans = DM_Sans({
variable: "--font-open-sans", variable: "--font-dm-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -46,7 +49,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${inter.variable} ${openSans.variable} antialiased`}> <body className={`${manrope.variable} ${dmSans.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-open-sans), sans-serif; font-family: var(--font-dm-sans), 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-inter), sans-serif; font-family: var(--font-manrope), sans-serif;
} }

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

@@ -10,15 +10,15 @@
--accent: #ffffff; --accent: #ffffff;
--background-accent: #ffffff; */ --background-accent: #ffffff; */
--background: #f5faff; --background: #fafffb;
--card: #f1f8ff; --card: #ffffff;
--foreground: #001122; --foreground: #001a0a;
--primary-cta: #15479c; --primary-cta: #0a705f;
--primary-cta-text: #f5faff; --primary-cta-text: #fafffb;
--secondary-cta: #ffffff; --secondary-cta: #ffffff;
--secondary-cta-text: #001122; --secondary-cta-text: #001a0a;
--accent: #a8cce8; --accent: #a8d9be;
--background-accent: #7ba3cf; --background-accent: #6bbfb8;
/* 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);