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
This commit is contained in:
2026-06-04 16:23:43 +08:00
parent 05a42ed018
commit c4ef9cc6ba
2 changed files with 0 additions and 6 deletions
-4
View File
@@ -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,