merge master, accept theirs for known conflict files

2026-06-03 21:53:47 +08:00
parent db79ee2c80 f86ca99548
commit fdf9c43731
20 changed files with 4448 additions and 1108 deletions
@@ -1489,7 +1489,7 @@
  --eval-text-secondary: #94a3b8;
  --eval-text-tertiary: #64748b;
  --eval-text-placeholder: #475569;
-  --eval-accent-start: #34d399;
+  --eval-accent-start: #00ff88;
  --eval-accent-mid: #10b981;
  --eval-accent-end: #059669;
  --eval-accent-glow: rgba(16, 185, 129, 0.3);