development/bc83e590-a752-4945-b711-ffd1d10582cb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 4 commits from version_2 into main 2026-01-26 02:09:49 +00:00
Conversation 0 Commits 4 Files Changed 4 +14 -14
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9aa3456ed1 - Show all commits

28
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f5f5;; /* --background: #f6f0e9;;
--card: #ffffff;; --card: #efe7dd;;
--foreground: #1c1c1c;; --foreground: #2b180a;;
--primary-cta: #6139e6;; --primary-cta: #2b180a;;
--secondary-cta: #ffffff;; --secondary-cta: #efe7dd;;
--accent: #6139e6;; --accent: #94877c;;
--background-accent: #b3a8e8;; */ --background-accent: #afa094;; */
--background: #f5f5f5;; --background: #f6f0e9;;
--card: #ffffff;; --card: #efe7dd;;
--foreground: #1c1c1c;; --foreground: #2b180a;;
--primary-cta: #6139e6;; --primary-cta: #2b180a;;
--secondary-cta: #ffffff;; --secondary-cta: #efe7dd;;
--accent: #6139e6;; --accent: #94877c;;
--background-accent: #b3a8e8;; --background-accent: #afa094;;
/* 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);