diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 44761e66c..be44c2952 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -97,15 +97,14 @@ function setupExtraNetworks() { function registerPrompt(tabname, id) { const textarea = gradioApp().querySelector(`#${id} > label > textarea`); if (!activePromptTextarea[tabname]) activePromptTextarea[tabname] = textarea; - textarea.addEventListener('focus', () => { - activePromptTextarea[tabname] = textarea; - }); + textarea.addEventListener('focus', () => { activePromptTextarea[tabname] = textarea; }); } registerPrompt('txt2img', 'txt2img_prompt'); registerPrompt('txt2img', 'txt2img_neg_prompt'); registerPrompt('img2img', 'img2img_prompt'); registerPrompt('img2img', 'img2img_neg_prompt'); + log('initExtraNetworks'); } onUiLoaded(setupExtraNetworks); diff --git a/javascript/settings.js b/javascript/settings.js index 0fe0c0bee..8eeb50b4a 100644 --- a/javascript/settings.js +++ b/javascript/settings.js @@ -138,27 +138,18 @@ onUiLoaded(() => { const observer = new MutationObserver((mutations) => { const show_all_pages_dummy = gradioApp().getElementById('settings_show_all_pages'); if (show_all_pages_dummy.style.display === 'none') { return; } - function mutation_on_style(mut) { - return mut.type === 'attributes' && mut.attributeName === 'style'; - } - if (mutations.some(mutation_on_style)) { - showAllSettings(); - } + const mutation_on_style = (mut) => mut.type === 'attributes' && mut.attributeName === 'style'; + if (mutations.some(mutation_on_style)) showAllSettings(); }); const tab_content_wrapper = document.createElement('div'); tab_content_wrapper.className = 'tab-content'; tab_nav_element.parentElement.insertBefore(tab_content_wrapper, tab_nav_element.nextSibling); - tab_elements.forEach((elem, index) => { - // Move the modification indicator to the toplevel tab button const tab_name = elem.id.replace('settings_', ''); const indicator = gradioApp().getElementById(`modification_indicator_${tab_name}`); tab_nav_element.insertBefore(indicator, tab_nav_buttons[index]); - - // Add the tab content to the wrapper tab_content_wrapper.appendChild(elem); - - // Add the mutation observer to the tab element observer.observe(elem, { attributes: true, attributeFilter: ['style'] }); }); + log('initSettings'); }); diff --git a/javascript/style.css b/javascript/style.css index b867d7d8b..20f4c5bd6 100644 --- a/javascript/style.css +++ b/javascript/style.css @@ -113,13 +113,14 @@ div#extras_scale_to_tab div.form{ flex-direction: row; } .tooltip-show { opacity: 0.9; } /* settings */ +.licenses { display: block !important; } #quicksettings { width: fit-content; align-items: end; } #quicksettings > div, #quicksettings > fieldset{ max-width: 20em; min-width: 24em; padding: 0; border: none; box-shadow: none; background: none; } #quicksettings > button { margin-left: -0.5em; } #settings { display: flex; gap: var(--layout-gap); } #settings div { border: none; display: inline-flex; justify-content: normal; } -#settings > div.tab-content { flex: 10 0 75%; } +#settings > div.tab-content { flex: 10 0 75%; display: grid; } #settings > div.tab-content > div { border: none; padding: 0; } #settings > div.tab-content > div > div > div > div > div { flex-direction: unset; } diff --git a/modules/ui.py b/modules/ui.py index 1a84a9de1..b2880d4a5 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1049,7 +1049,7 @@ def create_ui(startup_timer = None): loadsave.create_ui() create_dirty_indicator("tab_defaults", [], interactive=False) with gr.TabItem("Licenses", id="licenses", elem_id="settings_tab_licenses"): - gr.HTML(modules.shared.html("licenses.html"), elem_id="licenses") + gr.HTML(modules.shared.html("licenses.html"), elem_id="licenses", elem_classes="licenses") create_dirty_indicator("tab_licenses", [], interactive=False) with gr.TabItem("Show all pages", variant='primary', elem_id="settings_show_all_pages"): create_dirty_indicator("show_all_pages", [], interactive=False) diff --git a/requirements.txt b/requirements.txt index 8ac84cb60..85a95c0e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ requests==2.31.0 tqdm==4.65.0 accelerate==0.20.3 opencv-python-headless==4.7.0.72 -diffusers==0.20.0 +diffusers==0.20.1 einops==0.4.1 gradio==3.41.2 huggingface_hub==0.16.4