OmniAI/omniai-web
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge: resolve EcommercePage.tsx conflict, integrate master into profile-account-polish

Browse Source 
Keep master's EcommercePage.tsx (has more complete upload logic from prior conflict resolution). Accept all other master changes including canvas tool panels, task lifecycle, and workbench updates.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Stringadmin
2026-06-05 14:05:39 +08:00
parent b17a978e9e 91c332f567
commit d36d46836f
37 changed files with 3182 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/styles/pages/ecommerce.css
+38
View File
@@ -418,6 +418,15 @@
cursor: not-allowed;
}
.product-clone-page[data-tool="set"] .product-set-floating-submit--cancel {
background: #303540;
color: #eef2f6;
}
.product-clone-page[data-tool="set"] .product-set-floating-submit--cancel:hover {
background: #3a4050;
}
.product-clone-page[data-tool="set"] .product-clone-help {
display: none;
}
@@ -4255,6 +4264,7 @@
.product-clone-panel__footer {
display: grid;
align-items: center;
gap: 8px;
border-top: 1px solid #e5e7eb;
padding: 12px 16px;
}
@@ -4279,6 +4289,11 @@
cursor: not-allowed;
}
.product-clone-primary--cancel {
background: #303540;
color: #eef2f6;
}
.product-clone-preview {
display: grid;
align-content: center;
@@ -5209,6 +5224,7 @@
}
.product-set-main-card {
position: relative;
height: 380px;
border-radius: 16px;
transition: transform 250ms ease, box-shadow 250ms ease;
@@ -9045,6 +9061,17 @@
filter: none;
}
.product-clone-page[data-tool="clone"] .clone-ai-generate--cancel {
border: 1px solid var(--ecm-line);
background: var(--ecm-inset);
color: var(--ecm-text);
box-shadow: none;
}
.product-clone-page[data-tool="clone"] .clone-ai-generate--cancel:hover:not(:disabled) {
background: var(--ecm-inset-hover);
}
.product-clone-page[data-tool="clone"] .clone-ai-settings-toggle {
border-color: var(--ecm-line-strong);
background: rgba(20, 23, 25, 0.86);
@@ -9270,6 +9297,17 @@
box-shadow: none;
}
.product-clone-page:is([data-tool="set"], [data-tool="detail"], [data-tool="wear"]) :is(.product-clone-primary--cancel, .product-set-floating-submit--cancel) {
border: 1px solid var(--ecm-line);
background: var(--ecm-inset);
color: var(--ecm-text);
box-shadow: none;
}
.product-clone-page:is([data-tool="set"], [data-tool="detail"], [data-tool="wear"]) :is(.product-clone-primary--cancel, .product-set-floating-submit--cancel):hover {
background: var(--ecm-inset-hover);
}
.product-clone-page:is([data-tool="set"], [data-tool="detail"], [data-tool="wear"]) .product-clone-preview {
background:
radial-gradient(circle at 50% 40%, rgba(var(--ecm-accent-rgb), 0.032), transparent 40%),