merge master, accept theirs for known conflict files

This commit is contained in:
2026-06-03 21:53:47 +08:00
20 changed files with 4448 additions and 1108 deletions
+7 -7
View File
@@ -50,7 +50,7 @@
}
.ecom-video-flowbar__pulse.is-active {
background: #34d399;
background: #00ff88;
}
.ecom-video-flowbar__wave {
@@ -97,7 +97,7 @@
}
.ecom-video-step-dot.is-done {
background: #34d399;
background: #00ff88;
}
.ecom-video-step-dot.is-active {
@@ -139,7 +139,7 @@
place-items: center;
border: 1px solid #1c4d3a;
border-radius: 8px;
background: #34d399;
background: #00ff88;
color: #06110e;
padding: 0;
font-size: 17px;
@@ -213,7 +213,7 @@
}
.ecom-video-flow-lines path.is-active {
stroke: #34d399;
stroke: #00ff88;
animation: ecom-video-path-dash 1.8s linear infinite;
}
@@ -319,7 +319,7 @@
.ecom-video-flow-node.is-ready .ecom-video-flow-node__status-orb,
.ecom-video-flow-node.is-completed .ecom-video-flow-node__status-orb {
background: #34d399;
background: #00ff88;
}
.ecom-video-flow-node.is-running .ecom-video-flow-node__status-orb,
@@ -390,7 +390,7 @@
position: absolute;
inset: 0;
transform: translateX(-100%);
background: #34d399;
background: #00ff88;
}
.ecom-video-flow-connector.is-active i,
@@ -541,7 +541,7 @@
place-items: center;
border-radius: 999px;
background: #1c4d3a;
color: #34d399;
color: #00ff88;
font-size: 12px;
font-weight: 900;
}
File diff suppressed because it is too large Load Diff
+1285 -32
View File
File diff suppressed because it is too large Load Diff
+90 -44
View File
@@ -563,7 +563,10 @@ textarea.image-workbench-prompt {
align-items: center;
justify-content: center;
overflow: hidden;
background: var(--bg-inset);
background:
radial-gradient(circle, rgba(var(--accent-rgb), 0.12) 1px, transparent 1.4px),
var(--bg-inset);
background-size: 22px 22px;
}
.image-workbench-canvas img {
@@ -592,6 +595,7 @@ textarea.image-workbench-prompt {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 8px;
color: var(--fg-dim);
font-size: 14px;
@@ -625,16 +629,24 @@ textarea.image-workbench-prompt {
height: 100%;
}
.image-workbench-camera-stage {
flex-direction: column;
gap: 16px;
}
.image-workbench-inpaint-stage img,
.image-workbench-camera-stage img {
max-width: 90%;
max-height: 90%;
max-width: 95%;
max-height: 95%;
border-radius: 8px;
object-fit: contain;
}
.image-workbench-inpaint-stage > span,
.image-workbench-camera-stage > span {
.image-workbench-camera-stage img {
max-height: 68%;
}
.image-workbench-inpaint-stage > span {
position: absolute;
bottom: 12px;
left: 50%;
@@ -647,6 +659,15 @@ textarea.image-workbench-prompt {
white-space: nowrap;
}
.image-workbench-camera-stage > span {
padding: 4px 12px;
border-radius: var(--radius-xs);
background: rgba(0, 0, 0, 0.6);
color: #fff;
font-size: 13px;
white-space: nowrap;
}
/* Inpaint mask canvas */
.image-workbench-inpaint-canvas {
display: block;
@@ -689,16 +710,8 @@ textarea.image-workbench-prompt {
color: #fff;
}
.image-workbench-camera-stage > span {
bottom: 64px;
}
.image-workbench-camera-stage > .image-workbench-result-actions {
position: absolute;
bottom: 16px;
left: 50%;
width: min(360px, calc(100% - 32px));
transform: translateX(-50%);
}
.image-workbench-inpaint-tool.is-active {
@@ -809,7 +822,7 @@ textarea.image-workbench-prompt {
text-align: center;
}
.image-workbench-result-grid {
.image-workbench-panel--right .image-workbench-result-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(72px, 1fr));
gap: 8px;
@@ -1467,6 +1480,27 @@ textarea.image-workbench-prompt {
margin: 0;
}
.watermark-removal-actions {
flex-direction: column;
gap: 10px;
padding: 12px 0 0;
}
.watermark-removal-actions .image-workbench-primary {
width: 100%;
min-height: 48px;
justify-content: center;
font-size: 14px;
font-weight: 750;
}
.watermark-removal-actions .image-workbench-cancel {
width: 100%;
min-height: 42px;
justify-content: center;
font-size: 13px;
}
.watermark-removal-compare {
display: grid;
grid-template-columns: 1fr 1fr;
@@ -1519,34 +1553,42 @@ textarea.image-workbench-prompt {
.watermark-removal-compare__actions {
position: absolute;
bottom: 10px;
bottom: 16px;
left: 50%;
transform: translateX(-50%);
display: flex;
gap: 8px;
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 10px;
width: min(480px, calc(100% - 32px));
}
.watermark-removal-compare__actions button {
display: inline-flex;
align-items: center;
gap: 4px;
padding: 5px 12px;
border: none;
justify-content: center;
gap: 10px;
min-height: 64px;
padding: 0 24px;
border: 1px solid var(--border-subtle);
border-radius: var(--radius-xs);
background: rgba(0, 0, 0, 0.6);
color: #fff;
font-size: 12px;
background: var(--bg-inset);
color: var(--fg-body);
font: inherit;
font-size: 18px;
font-weight: 750;
cursor: pointer;
backdrop-filter: blur(4px);
transition: background 0.15s;
backdrop-filter: none;
transition: border-color 140ms ease, background 140ms ease, color 140ms ease;
}
.watermark-removal-compare__actions button:hover:not(:disabled) {
background: rgba(0, 0, 0, 0.8);
border-color: rgba(var(--accent-rgb), 0.42);
background: rgba(var(--accent-rgb), 0.11);
color: var(--accent);
}
.watermark-removal-compare__actions button:disabled {
opacity: 0.5;
opacity: 0.56;
cursor: not-allowed;
}
@@ -1563,33 +1605,33 @@ textarea.image-workbench-prompt {
}
.image-workbench-generating strong {
font-size: 15px;
font-size: 20px;
color: var(--fg-default);
}
.image-workbench-progress-bar {
width: 200px;
height: 6px;
border-radius: 3px;
width: 320px;
height: 8px;
border-radius: 4px;
background: var(--bg-inset);
overflow: hidden;
}
.image-workbench-progress-fill {
height: 100%;
border-radius: 3px;
border-radius: 4px;
background: var(--accent);
transition: width 0.3s ease;
}
.image-workbench-cancel {
margin-top: 8px;
padding: 6px 16px;
margin-top: 12px;
padding: 8px 24px;
border: 1px solid var(--border-subtle);
border-radius: var(--radius-xs);
background: transparent;
color: var(--fg-muted);
font-size: 13px;
font-size: 15px;
cursor: pointer;
transition: background 0.15s, color 0.15s;
}
@@ -1600,14 +1642,17 @@ textarea.image-workbench-prompt {
}
.image-workbench-result-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
gap: 12px;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
align-content: center;
width: 100%;
height: 100%;
padding: 16px;
margin: 0;
padding: 24px;
overflow-y: auto;
align-content: start;
gap: 16px;
}
.image-workbench-result-item {
@@ -1634,8 +1679,9 @@ textarea.image-workbench-prompt {
.image-workbench-result-card {
display: grid;
min-width: 0;
width: min(100%, 500px);
align-content: start;
gap: 8px;
gap: 12px;
}
.image-workbench-result-actions {
@@ -1647,16 +1693,16 @@ textarea.image-workbench-prompt {
.image-workbench-result-actions button {
display: inline-flex;
min-width: 0;
min-height: 34px;
min-height: 48px;
align-items: center;
justify-content: center;
gap: 5px;
gap: 8px;
border: 1px solid var(--border-subtle);
border-radius: var(--radius-xs);
background: var(--bg-inset);
color: var(--fg-body);
font: inherit;
font-size: 12px;
font-size: 14px;
font-weight: 750;
cursor: pointer;
transition: border-color 140ms ease, background 140ms ease, color 140ms ease;
File diff suppressed because it is too large Load Diff
+16
View File
@@ -1 +1,17 @@
/* Profile page rules move here as they are retired from legacy-pages.css. */
/* ── 代表作滚动容器:固定3列,刚好显示9个(3行),超出可滚动,隐藏滚动条 ── */
.profile-page__works-scroll {
max-height: 390px; /* 3行卡片:3 × 120(min-height) + 2 × 10(gap) = 380px,留10px余量 */
overflow-y: auto;
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE/Edge */
}
.profile-page__works-scroll::-webkit-scrollbar {
display: none; /* Chrome/Safari/Edge */
}
.profile-page__works-scroll .profile-page__list-grid {
grid-template-columns: repeat(3, 1fr); /* 固定3列,刚好3×3=9个可见 */
}
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1489,7 +1489,7 @@
--eval-text-secondary: #94a3b8;
--eval-text-tertiary: #64748b;
--eval-text-placeholder: #475569;
--eval-accent-start: #34d399;
--eval-accent-start: #00ff88;
--eval-accent-mid: #10b981;
--eval-accent-end: #059669;
--eval-accent-glow: rgba(16, 185, 129, 0.3);
+6 -6
View File
@@ -1,6 +1,6 @@
.product-clone-page[data-tool="clone"].size-template-workbench {
--clone-settings-panel-width: 640px;
--size-green: #34d399;
--size-green: #00ff88;
--size-cyan: #38bdf8;
--size-violet: #a78bfa;
--size-amber: #fbbf24;
@@ -106,7 +106,7 @@
.size-template-workbench .size-template-static-field.is-clickable > button:hover,
.size-template-workbench .size-template-static-field.is-clickable > button[aria-expanded="true"] {
border-color: #34d399;
border-color: #00ff88;
background: #202c28;
}
@@ -155,7 +155,7 @@
.size-template-platform-dialog button:hover,
.size-template-platform-dialog button.is-active {
background: #17352a;
color: #34d399;
color: #00ff88;
}
@keyframes size-template-dialog-rise {
@@ -241,7 +241,7 @@
width: 54px;
height: 2px;
border-radius: 999px;
background: linear-gradient(90deg, #34d399, rgb(52 211 153 / 0%));
background: linear-gradient(90deg, #00ff88, rgb(52 211 153 / 0%));
box-shadow: 0 0 18px rgb(52 211 153 / 35%);
}
@@ -355,7 +355,7 @@
}
.size-template-preview-note > div:first-child .anticon {
color: #34d399;
color: #00ff88;
}
.size-template-preview-note p {
@@ -414,7 +414,7 @@
}
.size-template-check-list .anticon {
color: #34d399;
color: #00ff88;
}
@media (max-width: 1320px) {
+3 -7
View File
@@ -376,23 +376,19 @@
margin-top: 8px;
}
.studio-result-actions--with-clear {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
.studio-result-actions button {
display: inline-flex;
min-width: 0;
min-height: 36px;
min-height: 48px;
align-items: center;
justify-content: center;
gap: 6px;
gap: 8px;
border: 1px solid var(--border-subtle);
border-radius: var(--radius-xs);
background: var(--bg-inset);
color: var(--fg-body);
font: inherit;
font-size: 12px;
font-size: 14px;
font-weight: 750;
cursor: pointer;
transition: border-color 140ms ease, background 140ms ease, color 140ms ease;
+43 -36
View File
@@ -3,15 +3,15 @@
--toolbox-green: #00ff88;
--toolbox-blue: #4fc3f7;
--toolbox-purple: #a855f7;
--toolbox-surface: rgba(14, 16, 38, 0.75);
--toolbox-elevated: rgba(20, 22, 52, 0.85);
--toolbox-surface: rgba(255, 255, 255, 0.04);
--toolbox-elevated: rgba(255, 255, 255, 0.06);
--toolbox-highlight: rgba(28, 31, 68, 0.9);
--toolbox-border-subtle: rgba(0, 255, 136, 0.08);
--toolbox-border-default: rgba(0, 255, 136, 0.14);
--toolbox-border-hover: rgba(0, 255, 136, 0.28);
--toolbox-text-primary: #f0f0f5;
--toolbox-text-secondary: rgba(240, 240, 245, 0.6);
--toolbox-text-tertiary: rgba(240, 240, 245, 0.4);
--toolbox-text-primary: #e8eaef;
--toolbox-text-secondary: #9aa1b8;
--toolbox-text-tertiary: #62697f;
position: relative;
isolation: isolate;
@@ -20,7 +20,7 @@
background:
linear-gradient(180deg, #070b10 0%, #05080d 100%),
radial-gradient(ellipse 80% 60% at 50% 40%, rgba(0, 255, 136, 0.04) 0%, transparent 70%),
radial-gradient(ellipse 60% 50% at 80% 70%, rgba(79, 195, 247, 0.03) 0%, transparent 60%),
radial-gradient(ellipse 60% 50% at 80% 70%, rgba(42, 159, 212, 0.03) 0%, transparent 60%),
radial-gradient(ellipse 50% 40% at 20% 80%, rgba(168, 85, 247, 0.03) 0%, transparent 60%);
scroll-snap-align: start;
scroll-snap-stop: normal;
@@ -30,21 +30,21 @@
position: relative;
z-index: 2;
display: flex;
gap: clamp(20px, 3vw, 40px);
padding: clamp(42px, 6vw, 82px) clamp(22px, 7vw, 92px);
gap: clamp(18px, 2.8vw, 36px);
padding: clamp(36px, 5.5vw, 68px) clamp(20px, 6vw, 76px);
min-height: var(--home-section-min-height);
align-items: center;
}
/* ===== Left Panel ===== */
.omni-home__toolbox-left {
width: clamp(340px, 30vw, 440px);
width: clamp(320px, 30vw, 450px);
flex-shrink: 0;
display: flex;
flex-direction: column;
gap: 16px;
gap: 17px;
justify-content: flex-start;
padding-top: clamp(40px, 8vh, 100px);
padding-top: clamp(34px, 6vh, 84px);
}
.omni-home__toolbox-brand {
@@ -54,31 +54,31 @@
}
.omni-home__toolbox-brand-icon {
width: 52px;
height: 52px;
width: 56px;
height: 56px;
background: var(--toolbox-green);
border-radius: 14px;
border-radius: 15px;
display: flex;
align-items: center;
justify-content: center;
color: #0a0b12;
font-size: 26px;
font-size: 28px;
}
.omni-home__toolbox-brand-icon .anticon {
font-size: 28px;
font-size: 30px;
}
.omni-home__toolbox-brand-text {
font-weight: 900;
font-size: 30px;
font-size: 34px;
color: #fff;
letter-spacing: -0.5px;
}
.omni-home__toolbox-title {
font-weight: 900;
font-size: clamp(34px, 3.6vw, 46px);
font-size: clamp(36px, 3.8vw, 50px);
line-height: 1.15;
background: linear-gradient(135deg, var(--toolbox-green), var(--toolbox-blue));
-webkit-background-clip: text;
@@ -87,9 +87,10 @@
}
.omni-home__toolbox-subtitle {
font-size: 17px;
line-height: 1.6;
font-size: 18px;
line-height: 1.55;
color: var(--toolbox-text-secondary);
max-width: 100%;
}
.omni-home__toolbox-list {
@@ -102,8 +103,8 @@
.omni-home__toolbox-item {
display: flex;
align-items: flex-start;
gap: 16px;
padding: 18px 22px;
gap: 17px;
padding: 17px 22px;
border-radius: 16px;
background: var(--toolbox-surface);
border: 1px solid var(--toolbox-border-subtle);
@@ -124,14 +125,14 @@
}
.omni-home__toolbox-item-icon {
font-size: 28px;
font-size: 29px;
flex-shrink: 0;
width: 48px;
height: 48px;
width: 50px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 12px;
border-radius: 13px;
background: rgba(0, 255, 136, 0.08);
}
@@ -139,18 +140,19 @@
display: flex;
flex-direction: column;
gap: 5px;
min-width: 0;
}
.omni-home__toolbox-item-name {
font-weight: 700;
font-size: 17px;
font-size: 19px;
color: var(--toolbox-text-primary);
}
.omni-home__toolbox-item-desc {
font-size: 14px;
font-size: 16px;
color: var(--toolbox-text-tertiary);
line-height: 1.5;
line-height: 1.4;
}
@keyframes omni-toolbox-fadeSlideIn {
@@ -160,14 +162,14 @@
.omni-home__toolbox-workflow {
margin-top: auto;
padding: 20px 24px;
padding: 19px 24px;
border-radius: 16px;
background: var(--toolbox-surface);
border: 1px solid var(--toolbox-border-subtle);
}
.omni-home__toolbox-workflow-label {
font-size: 14px;
font-size: 16px;
font-weight: 700;
color: var(--toolbox-green);
margin-bottom: 12px;
@@ -178,18 +180,21 @@
.omni-home__toolbox-workflow-steps {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 10px;
font-size: 14px;
font-size: 16px;
color: var(--toolbox-text-tertiary);
}
.omni-home__toolbox-workflow-step {
color: var(--toolbox-text-secondary);
white-space: nowrap;
}
.omni-home__toolbox-workflow-arrow {
color: var(--toolbox-green);
font-size: 14px;
font-size: 16px;
flex-shrink: 0;
}
/* ===== Grid Area ===== */
@@ -829,17 +834,19 @@
@media (max-width: 980px) {
.omni-home__toolbox-shell {
flex-direction: column;
padding: 48px 22px 64px;
padding: 36px 20px 48px;
gap: 24px;
}
.omni-home__toolbox-left {
width: 100%;
flex-shrink: unset;
padding-top: 0;
}
.omni-home__toolbox-grid {
width: 100%;
min-height: clamp(480px, 70vw, 700px);
min-height: clamp(400px, 60vw, 560px);
}
.omni-home__toolbox-workflow {
@@ -849,7 +856,7 @@
@media (max-width: 560px) {
.omni-home__toolbox-shell {
padding: 36px 18px 48px;
padding: 28px 16px 40px;
}
.omni-home__toolbox-title {