1580158
/
automatic
mirror of https://github.com/vladmandic/automatic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix token counter error style with modernui 

Signed-off-by: Vladimir Mandic <mandic00@live.com>
pull/3845/head
Vladimir Mandic 2025-03-24 18:08:33 -04:00
parent 6fe4b0604a
commit 06b0abc4f4
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -119,6 +119,7 @@ Plus support for **CogView-4**, **SANA 1.5**, new CLiP models, improvements to r
- fix upscaler selection in postprocessing
- fix sd35 with batch processing
- fix extra networks cover and inline views
- fix token counter error style with modernui
## Update for 2025-02-28

2
extensions-builtin/sdnext-modernui

@ -1 +1 @@
Subproject commit 4d0bde42e95c801dba3a48b9161e12b8ddc5d5bd
Subproject commit baee2e4397537554e6db67e7e2496258f024880f

10
javascript/base.css
View File

@ -4,11 +4,11 @@
.gradio-button.tool { max-width: min-content; min-width: min-content !important; align-self: end; font-size: 1.4em; color: var(--body-text-color) !important; }
/* token counters */
.block.token-counter { position: absolute; display: inline-block; right: 0; min-width: 0 !important; width: auto; z-index: 100; top: 0; }
.block.token-counter span { background: var(--input-background-fill) !important; box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075); border: 2px solid rgba(192,192,192,0.4) !important; }
.block.token-counter.error span{ box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075); border: 2px solid rgba(255,0,0,0.4) !important; }
.block.token-counter div { display: inline; }
.block.token-counter span { padding: 0.1em 0.75em; }
.token-counter { position: absolute; display: inline-block; right: 0; min-width: 0 !important; width: auto; z-index: 100; top: 0; }
.token-counter span { background: var(--input-background-fill) !important; box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075); border: 2px solid rgba(192,192,192,0.4) !important; }
.token-counter.error span{ box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075); border: 2px solid rgba(255,0,0,0.4) !important; }
.token-counter div { display: inline; }
.token-counter span { padding: 0.1em 0.75em; }
/* tooltips and statuses */
.infotext { overflow-wrap: break-word; }

2
javascript/promptChecker.js
View File

@ -34,4 +34,6 @@ async function initPromptChecker() {
setupBracketChecking('img2img_neg_prompt', 'img2img_negative_token_counter');
setupBracketChecking('control_prompt', 'control_token_counter');
setupBracketChecking('control_neg_prompt', 'control_negative_token_counter');
setupBracketChecking('video_prompt', 'video_token_counter');
setupBracketChecking('video_neg_prompt', 'video_negative_token_counter');
}

10
javascript/sdnext.css
View File

@ -84,11 +84,11 @@ button.custom-button { border-radius: var(--button-large-radius); padding: var(-
.theme-preview { display: none; position: fixed; border: var(--spacing-sm) solid var(--neutral-600); box-shadow: 2px 2px 2px 2px var(--neutral-700); top: 0; bottom: 0; left: 0; right: 0; margin: auto; max-width: 75vw; z-index: 999; }
/* txt2img/img2img specific */
.block.token-counter{ position: absolute; right: 1em; min-width: 0 !important; width: auto; z-index: 100; top: -0.5em; }
.block.token-counter span{ background: var(--input-background-fill) !important; box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075); border: 2px solid rgba(192,192,192,0.4) !important; }
.block.token-counter.error span{ box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075); border: 2px solid rgba(255,0,0,0.4) !important; }
.block.token-counter div{ display: inline; }
.block.token-counter span{ padding: 0.1em 0.75em; }
.token-counter { position: absolute; right: 1em; min-width: 0 !important; width: auto; z-index: 100; top: -0.5em; }
.token-counter span { background: var(--input-background-fill) !important; box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075); border: 2px solid rgba(192,192,192,0.4) !important; }
.token-counter.error span { box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075); border: 2px solid rgba(255,0,0,0.4) !important; }
.token-counter div { display: inline; }
.token-counter span { padding: 0.1em 0.75em; }
.performance { font-size: var(--text-xs); color: #444; }
.performance p { display: inline-block; color: var(--primary-500) !important }
.performance .time { margin-right: 0; }

3
modules/sd_models.py
View File

@ -764,7 +764,6 @@ def set_diffuser_pipe(pipe, new_pipe_type):
'InstantIRPipeline',
'FluxFillPipeline',
'FluxControlPipeline',
'StableVideoDiffusionPipeline',
'PixelSmithXLPipeline',
'PhotoMakerStableDiffusionXLPipeline',
'StableDiffusionXLInstantIDPipeline',
@ -781,6 +780,8 @@ def set_diffuser_pipe(pipe, new_pipe_type):
cls = pipe.__class__.__name__
if cls in exclude:
return pipe
if 'Video' in cls:
return pipe
if 'Onnx' in cls:
return pipe