diff --git a/javascript/ui.js b/javascript/ui.js index 206b66ad..47bef834 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -166,7 +166,6 @@ function submit(){ var id = randomId() requestProgress(id, gradioApp().getElementById('txt2img_gallery_container'), gradioApp().getElementById('txt2img_gallery'), function(){ showSubmitButtons('txt2img', true) - }) var res = create_submit_args(arguments) @@ -450,6 +449,31 @@ onUiUpdate(function(){ }) +/* gradioApp().querySelectorAll('[id^="image_buttons_"] button').forEach(function (elem){ + + if(elem.id == "txt2img_tab"){ + elem.setAttribute("tab-id", 0); + elem.removeEventListener('click', navTabClicked); + elem.addEventListener('click', navTabClicked); + }else if(elem.id == "img2img_tab" || elem.id == "inpaint_tab"){ + elem.setAttribute("tab-id", 1); + elem.removeEventListener('click', navTabClicked); + elem.addEventListener('click', navTabClicked); + }if(elem.id == "extras_tab"){ + elem.setAttribute("tab-id", 2); + elem.removeEventListener('click', navTabClicked); + elem.addEventListener('click', navTabClicked); + } + }) */ + +/* const pdiv = gradioApp().querySelector("#"+selectedTabItemId+" .progressDiv"); + if(!pdiv && selectedTabItemId == "tab_txt2img"){ + showSubmitButtons('txt2img', true); + }else if(!pdiv && selectedTabItemId == "tab_img2img"){ + showSubmitButtons('img2img', true); + } */ + + //window.onUiHeaderTabUpdate(); // also here the same issue /* @@ -471,6 +495,7 @@ onUiUpdate(function(){ netMenuVisibility(); } + // menu function disableScroll() { scrollTop = window.pageYOffset || document.documentElement.scrollTop; @@ -824,11 +849,9 @@ onUiUpdate(function(){ function navigate2TabItem(idx){ gradioApp().querySelectorAll('#tabs > div.tabitem').forEach(function (tabitem, index){ if(idx == index){ - tabitem.style.display = "block"; - //tabitem.classList.add("wtf"); + tabitem.style.display = "block"; }else{ - tabitem.style.display = "none"; - //tabitem.classList.remove("wtf"); + tabitem.style.display = "none"; } }) } @@ -866,7 +889,6 @@ onUiUpdate(function(){ parent_header_tabs.append(clonetab); clonetab.addEventListener('click', navTabClicked); - }) let div = document.createElement("div"); @@ -899,9 +921,24 @@ onUiUpdate(function(){ updateOpStyles(); } }) - + tabsHiddenChange(); + gradioApp().querySelectorAll('[id^="image_buttons_"] button, #png_2img_results button').forEach(function (elem){ + + if(elem.id == "txt2img_tab"){ + elem.setAttribute("tab-id", 0); + elem.addEventListener('click', navTabClicked); + }else if(elem.id == "img2img_tab" || elem.id == "inpaint_tab"){ + elem.setAttribute("tab-id", 1); + elem.addEventListener('click', navTabClicked); + }if(elem.id == "extras_tab"){ + elem.setAttribute("tab-id", 2); + elem.addEventListener('click', navTabClicked); + } + }) + + // add - remove quicksettings const settings_submit = gradioApp().querySelector('#settings_submit'); const quick_parent = gradioApp().querySelector("#quicksettings_overflow_container"); diff --git a/style.css b/style.css index 3b443759..da47e1ba 100644 --- a/style.css +++ b/style.css @@ -19,7 +19,7 @@ License: GNU General Public License --ae-top-header-inner-height:38px; --ae-top-header-height: calc( var(--ae-top-header-padding-top) + var(--ae-top-header-inner-height) + var(--ae-top-header-padding-bottom) ); --ae-container-padding:16px; - --ae-footer-height: calc( 38px + (var(--ae-container-padding) * 2) ); + --ae-footer-height: calc( 30px + (var(--ae-container-padding) * 2) ); --ae-gallery-bottom-height: calc(24px + (var(--ae-max-padding) * 2) + 16px + (var(--ae-inside-padding-size) * 2) + (var(--ae-outside-gap-size)* 3 )); --ae-subtract-total: calc( var(--ae-top-header-height) + var(--ae-footer-height)); @@ -1263,6 +1263,7 @@ input.svelte-56zyyb{ } [id$="2img_styles"] label > span{ padding-right: 5px; + margin-bottom:0!important; } [id$="2img_token_counter"].block, @@ -2758,7 +2759,15 @@ pre { /************/ /* Footer */ /************/ - +.app.svelte-ac4rv4.svelte-ac4rv4 { + min-height: 100vh !important; +} +.main > .wrap > .contain{ + flex-grow: 1; + display: flex; + flex-direction: column; +} + footer { display: none !important; } @@ -2794,6 +2803,7 @@ footer { border-radius: 100%; position: relative; display: flex; + margin: 0 !important; } .footer-links > li > div,