Merge origin/master: resolve CSS conflicts, keep both sides

2026-06-04 16:22:40 +08:00
parent 9e7bfdd206 20e219732d
commit 05a42ed018
80 changed files with 5491 additions and 3557 deletions
@@ -2649,6 +2649,7 @@
    min-height: 52px;
  }
 }
+<<<<<<< ours

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