extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-06-20 09:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0a87a7bec35bc7d3246649868c82f4d524405037 into 5c7625c425f12330eec34870511c31667d9fe349

Browse Source
This commit is contained in:
Ben Zichettello 2025-04-05 03:33:32 +07:00 committed by GitHub
commit cfb62dbecb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/media/css/main.css
View File

@ -729,15 +729,30 @@ div.img-preview img {
margin-right: 6px; margin-right: 6px;
cursor: move; cursor: move;
} }
.taskStatusLabel { /* Override conflicting css from imported library */
.header-content > .drag-handle {
min-width: initial !important;
}
.taskLabel {
font-size: 8pt; font-size: 8pt;
background:var(--background-color2); background:var(--background-color2);
border: 1px solid rgb(61, 62, 66); border: 1px solid rgb(61, 62, 66);
padding: 2pt 4pt; padding: 2pt 4pt;
border-radius: 2pt; border-radius: 2pt;
margin-right: 5pt;
display: inline; display: inline;
} }
.taskStatusLabel {
margin-right: 5pt;
}
.multiNumberOfImages {
font-weight: bold;
}
.taskNumberOfImagesLabel {
min-width: 30px;
display: inline-block;
text-align: center;
}
.activeTaskLabel { .activeTaskLabel {
background:rgb(0, 90, 30); background:rgb(0, 90, 30);
border: 1px solid rgb(0, 75, 19); border: 1px solid rgb(0, 75, 19);

3
ui/media/js/main.js
View File

@ -1204,7 +1204,8 @@ function createTask(task) {
taskEntry.className = "imageTaskContainer" taskEntry.className = "imageTaskContainer"
taskEntry.innerHTML = ` <div class="header-content panel collapsible active"> taskEntry.innerHTML = ` <div class="header-content panel collapsible active">
<i class="drag-handle fa-solid fa-grip"></i> <i class="drag-handle fa-solid fa-grip"></i>
<div class="taskStatusLabel">Enqueued</div> <div class="taskLabel taskNumberOfImagesLabel ${task.numOutputsTotal > 1 ? 'multiNumberOfImages' : ''}">✕${task.numOutputsTotal}</div>
<div class="taskLabel taskStatusLabel">Enqueued</div>
<button class="secondaryButton stopTask"><i class="fa-solid fa-xmark"></i> Cancel</button> <button class="secondaryButton stopTask"><i class="fa-solid fa-xmark"></i> Cancel</button>
<button class="tertiaryButton useSettings"><i class="fa-solid fa-redo"></i> Use these settings</button> <button class="tertiaryButton useSettings"><i class="fa-solid fa-redo"></i> Use these settings</button>
<div class="preview-prompt"></div> <div class="preview-prompt"></div>