diff --git a/CHANGELOG.md b/CHANGELOG.md index db60812f3..238b87fd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2023-10-2 +## Update for 2023-10-30 *Note*: Pending release of `diffusers==0.22.0` diff --git a/extensions-builtin/stable-diffusion-webui-rembg b/extensions-builtin/stable-diffusion-webui-rembg index 7fb6a263d..7f5772962 160000 --- a/extensions-builtin/stable-diffusion-webui-rembg +++ b/extensions-builtin/stable-diffusion-webui-rembg @@ -1 +1 @@ -Subproject commit 7fb6a263d66c4167f386bf6f66b12f187d44505e +Subproject commit 7f57729626503837a70ad9eed92313bc36db7bf3 diff --git a/javascript/amethyst-nightfall.css b/javascript/amethyst-nightfall.css index 6cf91ab63..efa24fa93 100644 --- a/javascript/amethyst-nightfall.css +++ b/javascript/amethyst-nightfall.css @@ -119,9 +119,6 @@ svg.feather.feather-image, .feather .feather-image { display: none } .gradio-button.tool { filter: hue-rotate(180deg) saturate(0.5); } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; z-index: 200; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --body-background-fill: #000000; /* Black */ diff --git a/javascript/black-orange.css b/javascript/black-orange.css index 4677d4db4..dac768caf 100644 --- a/javascript/black-orange.css +++ b/javascript/black-orange.css @@ -133,9 +133,6 @@ svg.feather.feather-image, .feather .feather-image { display: none } .gradio-button.tool { filter: hue-rotate(180deg) saturate(0.5); } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; z-index: 200; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --body-background-fill: var(--background-color); diff --git a/javascript/black-teal.css b/javascript/black-teal.css index b7ba073b4..0f9bc5003 100644 --- a/javascript/black-teal.css +++ b/javascript/black-teal.css @@ -135,9 +135,6 @@ textarea[rows="1"] { height: 33px !important; width: 99% !important; padding: 8p #pnginfo_html2_info { margin-top: -18px; background-color: var(--input-background-fill); padding: var(--input-padding) } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --body-background-fill: var(--background-color); diff --git a/javascript/invoked.css b/javascript/invoked.css index 6d4150d02..3836645e2 100644 --- a/javascript/invoked.css +++ b/javascript/invoked.css @@ -126,9 +126,6 @@ button.selected {background: var(--button-primary-background-fill);} #txt2img_tools, #img2img_tools { margin-top: -4px; margin-bottom: -4px; } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; z-index: 200; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --body-background-fill: var(--background-color); diff --git a/javascript/light-teal.css b/javascript/light-teal.css index b8c71d9c4..4c86e9615 100644 --- a/javascript/light-teal.css +++ b/javascript/light-teal.css @@ -130,9 +130,6 @@ svg.feather.feather-image, .feather .feather-image { display: none } #pnginfo_html2_info { margin-top: -18px; background-color: var(--input-background-fill); padding: var(--input-padding) } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; z-index: 200; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --background-fill-secondary: none; diff --git a/javascript/midnight-barbie.css b/javascript/midnight-barbie.css index 238dac9ff..1b5bac3dc 100644 --- a/javascript/midnight-barbie.css +++ b/javascript/midnight-barbie.css @@ -119,9 +119,6 @@ svg.feather.feather-image, .feather .feather-image { display: none } .gradio-button.tool { filter: hue-rotate(120deg) saturate(0.5); } #txt2img_styles_row, #img2img_styles_row { margin-top: -6px; z-index: 200; } -/* custom elements overrides */ -#steps-animation, #controlnet { border-width: 0; } - /* based on gradio built-in dark theme */ :root, .light, .dark { --body-background-fill: var(--background-color); diff --git a/javascript/sdnext.css b/javascript/sdnext.css index e1a8b2c48..a03acd437 100644 --- a/javascript/sdnext.css +++ b/javascript/sdnext.css @@ -46,12 +46,12 @@ tr { border-bottom: none !important; padding: 0.1em 0.5em !important; } /* custom gradio elements */ .accordion-compact { padding: 8px 0px 4px 0px !important; } -.settings-accordion .gap { padding-right: 1000px; } -.settings-accordion >div { flex-flow: wrap; } -.small-accordion .form { min-width: var(--left-column) !important; } +.settings-accordion > div { flex-flow: wrap; } +.small-accordion .form { min-width: var(--left-column) !important; width: max-content; } .small-accordion .label-wrap .icon { margin-right: 1.6em; margin-left: 0.6em; color: var(--button-primary-border-color); } .small-accordion .label-wrap { padding: 16px 0px 8px 0px; margin: 0; border-top: 2px solid var(--button-secondary-border-color); } .small-accordion { width: fit-content !important; padding-left: 0 !important; } +.extension-script { max-width: 50vw; } button.custom-button{ border-radius: var(--button-large-radius); padding: var(--button-large-padding); font-weight: var(--button-large-text-weight); border: var(--button-border-width) solid var(--button-secondary-border-color); background: var(--button-secondary-background-fill); color: var(--button-secondary-text-color); font-size: var(--button-large-text-size); display: inline-flex; justify-content: center; align-items: center; transition: var(--button-transition); box-shadow: var(--button-shadow); text-align: center; } diff --git a/modules/paths.py b/modules/paths.py index b3dbaef8b..64fb25b20 100644 --- a/modules/paths.py +++ b/modules/paths.py @@ -18,7 +18,7 @@ try: with open(config_path, 'r', encoding='utf8') as f: config = json.load(f) except Exception as err: - print('Error loading config file: ${config_path} {err}') + print(f'Error loading config file: ${config_path} {err}') config = {} modules_path = os.path.dirname(os.path.realpath(__file__)) diff --git a/modules/scripts.py b/modules/scripts.py index 323aca6a1..6d45cdd88 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -471,7 +471,7 @@ class ScriptRunner: for script in self.alwayson_scripts: t0 = time.time() elem_id = f'script_{"txt2img" if script.is_txt2img else "img2img"}_{script.title().lower().replace(" ", "_")}' - with gr.Group(elem_id=elem_id) as group: + with gr.Group(elem_id=elem_id, elem_classes=['extension-script']) as group: create_script_ui(script, inputs, inputs_alwayson) script.group = group time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0) diff --git a/modules/scripts_postprocessing.py b/modules/scripts_postprocessing.py index 29f294b2a..47de61b51 100644 --- a/modules/scripts_postprocessing.py +++ b/modules/scripts_postprocessing.py @@ -88,7 +88,7 @@ class ScriptPostprocessingRunner: def setup_ui(self): inputs = [] for script in self.scripts_in_preferred_order(): - with gr.Accordion(label=script.name, open=False) as group: + with gr.Accordion(label=script.name, open=False, elem_classes=['postprocess']) as group: self.create_script_ui(script, inputs) script.group = group self.ui_created = True diff --git a/modules/ui.py b/modules/ui.py index 21f816c58..7a629a00a 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -644,7 +644,7 @@ def create_ui(startup_timer = None): steps, sampler_index = create_sampler_and_steps_selection(modules.sd_samplers.samplers_for_img2img, "img2img") with gr.Accordion(open=False, label="Resize", elem_classes=["small-accordion"], elem_id="img2img_resize_group"): - with FormRow(): + with gr.Row(): resize_mode = gr.Radio(label="Resize mode", elem_id="resize_mode", choices=["None", "Resize fixed", "Crop and resize", "Resize and fill", "Latent upscale"], type="index", value="None") with FormRow():