diff --git a/web/css/resolver-main.css b/web/css/resolver-main.css index 3d96419..635003e 100644 --- a/web/css/resolver-main.css +++ b/web/css/resolver-main.css @@ -424,40 +424,6 @@ gap: var(--mr-spacing-8); } -.mr-download-progress-item { - padding: var(--mr-spacing-8); - border: 1px solid var(--mr-border); - border-radius: var(--mr-radius-xl); - background: rgba(255, 255, 255, 0.025); -} - -.mr-download-progress-item-head { - display: flex; - align-items: center; - justify-content: space-between; - gap: var(--mr-spacing-8); - margin-bottom: var(--mr-spacing-5); - color: var(--mr-text-muted); - font-size: var(--mr-font-sm); - font-weight: 700; -} - -.mr-download-progress-item-head > span:first-child { - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.mr-download-progress-item-head > span:last-child { - flex: 0 0 auto; - color: var(--mr-text); -} - -.mr-download-progress-item .mr-progress-container { - margin-top: 0; -} - .mr-civitai-open-btn { background: transparent; color: var(--mr-color-civitai); diff --git a/web/css/resolver-shell.css b/web/css/resolver-shell.css index 8a68355..48ae36c 100644 --- a/web/css/resolver-shell.css +++ b/web/css/resolver-shell.css @@ -682,6 +682,10 @@ box-shadow: 0 8px 24px rgba(0, 0, 0, 0.22); } +.mr-download-queue-items > .mr-download-queue-item:not(:last-child) { + margin-bottom: 0; +} + /* The Missing Models preview already provides the panel's horizontal padding. */ #model-resolver-modal .mr-missing-detail-pane .mr-download-progress-slot .mr-download-queue-item { margin: 0; diff --git a/web/resolver/actions/queue_methods.js b/web/resolver/actions/queue_methods.js index 0012708..b14e4f1 100644 --- a/web/resolver/actions/queue_methods.js +++ b/web/resolver/actions/queue_methods.js @@ -1053,8 +1053,11 @@ export const queueMethods = { } if (!currentChild) { - current.appendChild(nextChild.cloneNode(true)); - cursor = null; + // Insert at the current position so the cleanup pass can + // remove an obsolete single-card/group root after a mode switch. + const insertedChild = nextChild.cloneNode(true); + current.insertBefore(insertedChild, cursor); + cursor = insertedChild.nextSibling; continue; } diff --git a/web/resolver/actions/resolve_download_methods.js b/web/resolver/actions/resolve_download_methods.js index 20a1a54..642a298 100644 --- a/web/resolver/actions/resolve_download_methods.js +++ b/web/resolver/actions/resolve_download_methods.js @@ -1215,22 +1215,7 @@ export const resolveDownloadMethods = { }, renderDownloadProgressGroupItem(downloadId, snapshot) { - const progress = snapshot.progress || {}; - const status = snapshot.status || progress.status || ''; - const displayProgress = this.getDownloadDisplayProgress(progress); - const percent = displayProgress.percent; - const filename = progress.filename || snapshot.filename || 'Download'; - const statusLabel = this.getDownloadProgressStatusLabel(status, percent, displayProgress.isFinalizing); - const itemIdAttr = downloadId ? ` data-download-id="${this.escapeHtml(String(downloadId))}"` : ''; - return ` -