From c4ef9cc6bade39ec6727323d4c4b3fc68ad4a6bc Mon Sep 17 00:00:00 2001
From: ludan <251918489@qq.com>
Date: Thu, 4 Jun 2026 16:23:43 +0800
Subject: [PATCH] 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
---
 src/styles/pages/script-tokens-v5.css | 2 --
 src/styles/themes/dark-green.css      | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/styles/pages/script-tokens-v5.css b/src/styles/pages/script-tokens-v5.css
index f13933a..f8d25db 100644
--- a/src/styles/pages/script-tokens-v5.css
+++ b/src/styles/pages/script-tokens-v5.css
@@ -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
diff --git a/src/styles/themes/dark-green.css b/src/styles/themes/dark-green.css
index 8b743ba..ce421cd 100644
--- a/src/styles/themes/dark-green.css
+++ b/src/styles/themes/dark-green.css
@@ -6089,7 +6089,6 @@
   box-shadow: none;
 }
 
-<<<<<<< ours
 .web-shell[data-ui-theme="dark-green"] .profile-page__meta-item small {
   overflow: hidden;
   color: var(--fg-soft);
@@ -8397,7 +8396,6 @@
 .web-shell[data-ui-theme="dark-green"] .canvas-page .studio-canvas-node-resize-handle::before,
 .web-shell[data-ui-theme="dark-green"] .canvas-page .studio-canvas-node-resize-handle::after {
   background: var(--dg-button-text);
->>>>>>> theirs
 }
 
 .web-shell[data-ui-theme="dark-green"] .canvas-page .studio-canvas-save-asset {
@@ -8797,7 +8795,6 @@
   }
 }
 
-<<<<<<< ours
 /* Ecommerce final polish: keep selected option states refined in the dark-green theme. */
 .web-shell[data-ui-theme="dark-green"][data-view="ecommerce"] .product-clone-page[data-tool="clone"] :is(
   .clone-ai-module-list button,
@@ -8917,7 +8914,6 @@
   --commerce-panel: #151719;
   --commerce-soft: #101214;
   background: #0d0d0f;
->>>>>>> theirs
 }
 
 .web-shell[data-ui-theme="dark-green"] .omni-commerce-panel,