Merge origin/master: resolve CSS conflicts

script-tokens-v5.css: keep both SaaS polish rules and master's additions dark-green.css: keep both profile/canvas polish and master's additions
2026-06-04 16:23:43 +08:00
parent 05a42ed018
commit c4ef9cc6ba
2 changed files with 0 additions and 6 deletions
@@ -2649,7 +2649,6 @@
    min-height: 52px;
  }
 }
-<<<<<<< ours

 /* ===== Commercial SaaS polish for script review page ===== */
 .script-eval-v5 {
@@ -3930,4 +3929,3 @@
 .script-eval-v5.is-ready .script-eval-v5-status-dot {
  box-shadow: none;
 }
->>>>>>> theirs