diff --git a/javascript/base.css b/javascript/base.css index a154f3d0e..799f06613 100644 --- a/javascript/base.css +++ b/javascript/base.css @@ -107,11 +107,10 @@ table.settings-value-table td { padding: 0.4em; border: 1px solid #ccc; max-widt #txt2img_description, #img2img_description { max-height: 63px; overflow-y: auto !important; } #txt2img_description > label > textarea, #img2img_description > label > textarea { font-size: 0.9em } -#txt2img_extra_details > div, #img2img_extra_details > div { overflow-y: auto; min-height: 40vh; max-height: 80vh; align-self: flex-start; } -#txt2img_extra_details, #img2img_extra_details { position: fixed; bottom: 50%; left: 50%; transform: translate(-50%, 50%); padding: 0.8em; border: var(--block-border-width) solid var(--highlight-color) !important; - z-index: 100; box-shadow: var(--button-shadow); } -#txt2img_extra_details td:first-child, #img2img_extra_details td:first-child { font-weight: bold; vertical-align: top; } -#txt2img_extra_details .gradio-image, #img2img_extra_details .gradio-image { max-height: 70vh; } +.extra-details { position: fixed; bottom: 50%; left: 50%; transform: translate(-50%, 50%); padding: 0.8em; border: var(--block-border-width) solid var(--highlight-color) !important; z-index: 100; box-shadow: var(--button-shadow); } +.extra-details > div { overflow-y: auto; min-height: 40vh; max-height: 80vh; align-self: flex-start; } +.extra-details td:first-child { font-weight: bold; vertical-align: top; } +.extra-details td .gradio-image { max-height: 70vh; } /* custom component */ .folder-selector textarea { height: 2em !important; padding: 6px !important; } diff --git a/javascript/contextMenus.js b/javascript/contextMenus.js index 80b685106..a10325ce2 100644 --- a/javascript/contextMenus.js +++ b/javascript/contextMenus.js @@ -85,24 +85,24 @@ const appendContextMenuOption = initResponse[0]; const removeContextMenuOption = initResponse[1]; const addContextMenuEventListener = initResponse[2]; -async function initContextMenu() { - const generateForever = (genbuttonid, interruptbuttonid) => { - if (window.generateOnRepeatInterval) { - log('generateForever: cancel'); - clearInterval(window.generateOnRepeatInterval); - window.generateOnRepeatInterval = null; - } else { - log('generateForever: start'); - const genbutton = gradioApp().querySelector(genbuttonid); - const busy = document.getElementById('progressbar')?.style.display === 'block'; - if (!busy) genbutton.click(); - window.generateOnRepeatInterval = setInterval(() => { - const pbBusy = document.getElementById('progressbar')?.style.display === 'block'; - if (!pbBusy) genbutton.click(); - }, 500); - } - }; +const generateForever = (genbuttonid) => { + if (window.generateOnRepeatInterval) { + log('generateForever: cancel'); + clearInterval(window.generateOnRepeatInterval); + window.generateOnRepeatInterval = null; + } else { + log('generateForever: start'); + const genbutton = gradioApp().querySelector(genbuttonid); + const busy = document.getElementById('progressbar')?.style.display === 'block'; + if (!busy) genbutton.click(); + window.generateOnRepeatInterval = setInterval(() => { + const pbBusy = document.getElementById('progressbar')?.style.display === 'block'; + if (!pbBusy) genbutton.click(); + }, 500); + } +}; +async function initContextMenu() { for (const tab of ['txt2img', 'img2img', 'control']) { for (const el of ['generate', 'interrupt', 'skip', 'pause', 'paste', 'clear_prompt', 'extra_networks_btn']) { const id = `#${tab}_${el}`; diff --git a/wiki b/wiki index 9c936097e..340159b59 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 9c936097e6c6c9344cb0a7b80d85bfd3ca33bb1f +Subproject commit 340159b59dd118ad211197c42996f1ea064061aa