diff --git a/javascript/sdnext.css b/javascript/sdnext.css index 31b8a8f5c..f07228cf0 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -94,7 +94,8 @@ div#extras_scale_to_tab div.form{ flex-direction: row; } #mode_img2img .gradio-image > div.fixed-height, #mode_img2img .gradio-image > div.fixed-height img{ height: 480px !important; max-height: 480px !important; min-height: 480px !important; } #img2img_sketch, #img2maskimg, #inpaint_sketch { overflow: overlay !important; resize: auto; background: var(--panel-background-fill); z-index: 5; } .image-buttons button{ min-width: auto; } -.infotext { overflow-wrap: break-word; } +.infotext { overflow-wrap: break-word; line-height: 1.5em; } +.infotext > p { padding-left: 1em; text-indent: -1em; } .tooltip { display: block; position: fixed; top: 1em; right: 1em; padding: 0.5em; background: var(--input-background-fill); color: var(--body-text-color); border: 1pt solid var(--button-primary-border-color); width: 22em; min-height: 1.3em; font-size: 0.8em; transition: opacity 0.2s ease-in; pointer-events: none; opacity: 0; z-index: 999; } .tooltip-show { opacity: 0.9; } @@ -234,7 +235,6 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt .extras { gap: 0.2em 1em !important } #extras_generate, #extras_interrupt, #extras_skip { display: block !important; position: relative; height: 36px; } #extras_upscale { margin-top: 10px } -#pnginfo_html_info { line-height: 1.5em; } /* log monitor */ .log-monitor { display: none; justify-content: unset !important; overflow: hidden; padding: 0; margin-top: auto; font-family: monospace; font-size: 0.85em; } diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py index 59ec22a41..00b22055d 100644 --- a/modules/processing_diffusers.py +++ b/modules/processing_diffusers.py @@ -470,7 +470,6 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro desc='Base', ) shared.state.sampling_steps = base_args['num_inference_steps'] - p.extra_generation_params['CFG rescale'] = p.diffusers_guidance_rescale p.extra_generation_params["Sampler Eta"] = shared.opts.scheduler_eta if shared.opts.scheduler_eta is not None and shared.opts.scheduler_eta > 0 and shared.opts.scheduler_eta < 1 else None try: output = shared.sd_model(**base_args) # pylint: disable=not-callable diff --git a/modules/ui_common.py b/modules/ui_common.py index 9206c6c59..a2b8aa1ee 100644 --- a/modules/ui_common.py +++ b/modules/ui_common.py @@ -6,7 +6,7 @@ import platform import subprocess import gradio as gr from modules import call_queue, shared -from modules.generation_parameters_copypaste import image_from_url_text +from modules.generation_parameters_copypaste import image_from_url_text, parse_generation_parameters import modules.ui_symbols as symbols import modules.images import modules.script_callbacks @@ -34,12 +34,19 @@ def plaintext_to_html(text): def infotext_to_html(text): - res = '
Prompt: ' + html.escape(text or '').replace('\n', '
') + '
Prompt: {prompt}
+Negative: {negative}
+Parameters: {params}
+ ''' + return code def delete_files(js_data, images, _html_info, index):