From 68999d0b15d612965e7bc7feb62d6b4d55e112fa Mon Sep 17 00:00:00 2001
From: space-nuko <24979496+space-nuko@users.noreply.github.com>
Date: Sat, 25 Mar 2023 12:52:14 -0400
Subject: Add upscale slider to img2img

---
 style.css | 772 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 513 insertions(+), 259 deletions(-)

(limited to 'style.css')

diff --git a/style.css b/style.css
index 0dcc3e25..7d58b3b2 100644
--- a/style.css
+++ b/style.css
@@ -1,316 +1,270 @@
-
-/* general gradio fixes */
-
-:root, .dark{
-    --checkbox-label-gap: 0.25em 0.1em;
-    --section-header-text-size: 12pt;
-    --block-background-fill: transparent;
+.container {
+    max-width: 100%;
 }
 
-.block.padded{
-    padding: 0 !important;
+.token-counter{
+    position: absolute;
+    display: inline-block;
+    right: 2em;
+    min-width: 0 !important;
+    width: auto;
+    z-index: 100;
 }
 
-div.gradio-container{
-    max-width: unset !important;
+.token-counter.error span{
+    box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075);
+    border: 2px solid rgba(255,0,0,0.4) !important;
 }
 
-.hidden{
-    display: none;
+.token-counter div{
+    display: inline;
 }
 
-.compact{
-    background: transparent !important;
-    padding: 0 !important;
+.token-counter span{
+    padding: 0.1em 0.75em;
 }
 
-div.form{
-    border-width: 0;
-    box-shadow: none;
-    background: transparent;
-    overflow: visible;
-    gap: 0.5em;
+#sh{
+    min-width: 2em;
+    min-height: 2em;
+    max-width: 2em;
+    max-height: 2em;
+    flex-grow: 0;
+    padding-left: 0.25em;
+    padding-right: 0.25em;
+    margin: 0.1em 0;
+    opacity: 0%;
+    cursor: default;
 }
 
-.block.gradio-dropdown,
-.block.gradio-slider,
-.block.gradio-checkbox,
-.block.gradio-textbox,
-.block.gradio-radio,
-.block.gradio-checkboxgroup,
-.block.gradio-number,
-.block.gradio-colorpicker
-{
-    border-width: 0 !important;
-    box-shadow: none !important;
-}
+.output-html p {margin: 0 0.5em;}
 
-.gap.compact{
-    padding: 0;
-    gap: 0.2em 0;
+.row > *,
+.row > .gr-form > * {
+    min-width: min(120px, 100%);
+    flex: 1 1 0%;
 }
 
-div.compact{
-    gap: 1em;
+.performance {
+    font-size: 0.85em;
+    color: #444;
 }
 
-.gradio-dropdown ul.options{
-    z-index: 3000;
+.performance p{
+    display: inline-block;
 }
 
-.gradio-dropdown label span:not(.has-info),
-.gradio-textbox label span:not(.has-info),
-.gradio-number label span:not(.has-info)
-{
-    margin-bottom: 0;
+.performance .time {
+    margin-right: 0;
 }
 
-.gradio-dropdown div.wrap.wrap.wrap.wrap{
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+.performance .vram {
 }
 
-.gradio-dropdown .wrap-inner.wrap-inner.wrap-inner{
-    flex-wrap: unset;
+#txt2img_generate, #img2img_generate {
+    min-height: 4.5em;
 }
 
-.gradio-dropdown .single-select{
-    white-space: nowrap;
-    overflow: hidden;
+@media screen and (min-width: 2500px) {
+    #txt2img_gallery, #img2img_gallery {
+        min-height: 768px;
+    }
 }
 
-.gradio-dropdown .token-remove.remove-all.remove-all{
-    display: none;
+#txt2img_gallery img, #img2img_gallery img{
+    object-fit: scale-down;
 }
-
-.gradio-dropdown.multiselect .token-remove.remove-all.remove-all{
-    display: flex;
+#txt2img_actions_column, #img2img_actions_column {
+	margin: 0.35rem 0.75rem 0.35rem 0;	
 }
-
-.gradio-slider input[type="number"]{
-    width: 6em;
+#script_list {
+    padding: .625rem .75rem 0 .625rem;
 }
-
-.block.gradio-checkbox {
-    margin: 0.75em 1.5em 0 0;
+.justify-center.overflow-x-scroll {
+    justify-content: left;
 }
 
-.gradio-html div.wrap{
-    height: 100%;
-}
-div.gradio-html.min{
-    min-height: 0;
+.justify-center.overflow-x-scroll button:first-of-type {
+    margin-left: auto;
 }
 
-.block.gradio-gallery{
-    background: var(--input-background-fill);
+.justify-center.overflow-x-scroll button:last-of-type {
+    margin-right: auto;
 }
 
-.gradio-container .prose a, .gradio-container .prose a:visited{
-    color: unset;
-    text-decoration: none;
+[id$=_random_seed], [id$=_random_subseed], [id$=_reuse_seed], [id$=_reuse_subseed], #open_folder{
+    min-width: 2.3em;
+    height: 2.5em;
+    flex-grow: 0;
+    padding-left: 0.25em;
+    padding-right: 0.25em;
 }
 
-
-
-/* general styled components */
-
-.gradio-button.tool{
-    max-width: 2.2em;
-    min-width: 2.2em !important;
-    height: 2.4em;
-    align-self: end;
-    line-height: 1em;
-    border-radius: 0.5em;
+#hidden_element{
+    display: none;
 }
 
-.checkboxes-row{
-    margin-bottom: 0.5em;
-    margin-left: 0em;
+[id$=_seed_row], [id$=_subseed_row]{
+    gap: 0.5rem;
+    padding: 0.6em;
 }
-.checkboxes-row > div{
-    flex: 0;
-    white-space: nowrap;
+
+[id$=_subseed_show_box]{
     min-width: auto;
+    flex-grow: 0;
 }
 
-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;
+[id$=_subseed_show_box] > div{
+    border: 0;
+    height: 100%;
 }
 
-
-/* txt2img/img2img specific */
-
-.block.token-counter{
-    position: absolute;
-    display: inline-block;
-    right: 1em;
-    min-width: 0 !important;
-    width: auto;
-    z-index: 100;
-    top: -0.75em;
+[id$=_subseed_show]{
+    min-width: auto;
+    flex-grow: 0;
+    padding: 0;
 }
 
-.block.token-counter span{
-    background: var(--input-background-fill) !important;
-    box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075);
-    border: 2px solid rgba(192,192,192,0.4) !important;
-    border-radius: 0.4em;
+[id$=_subseed_show] label{
+    height: 100%;
 }
 
-.block.token-counter.error span{
-    box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075);
-    border: 2px solid rgba(255,0,0,0.4) !important;
+#txt2img_actions_column, #img2img_actions_column{
+    gap: 0;
+    margin-right: .75rem;
 }
 
-.block.token-counter div{
-    display: inline;
+#txt2img_tools, #img2img_tools{
+    gap: 0.4em;
 }
 
-.block.token-counter span{
-    padding: 0.1em 0.75em;
+#interrogate_col{
+    min-width: 0 !important;
+    max-width: 8em !important;
+    margin-right: 1em;
+    gap: 0;
 }
-
-[id$=_subseed_show]{
-    min-width: auto !important;
-    flex-grow: 0 !important;
-    display: flex;
+#interrogate, #deepbooru{
+    margin: 0em 0.25em 0.5em 0.25em;
+    min-width: 8em;
+    max-width: 8em;
 }
 
-[id$=_subseed_show] label{
-    margin-bottom: 0.5em;
-    align-self: end;
+#style_pos_col, #style_neg_col{
+    min-width: 8em !important;
 }
 
-.performance {
-    font-size: 0.85em;
-    color: #444;
+#txt2img_styles_row, #img2img_styles_row{
+    gap: 0.25em;
+    margin-top: 0.3em;
 }
 
-.performance p{
-    display: inline-block;
+#txt2img_styles_row > button, #img2img_styles_row > button{
+    margin: 0;
 }
 
-.performance .time {
-    margin-right: 0;
+#txt2img_styles, #img2img_styles{
+    padding: 0;
 }
 
-.performance .vram {
+#txt2img_styles > label > div, #img2img_styles > label > div{
+    min-height: 3.2em;
 }
 
-#txt2img_generate, #img2img_generate {
-    min-height: 4.5em;
+ul.list-none{
+    max-height: 35em;
+    z-index: 2000;
 }
 
-@media screen and (min-width: 2500px) {
-    #txt2img_gallery, #img2img_gallery {
-        min-height: 768px;
-    }
+.gr-form{
+    background: transparent;
 }
 
-#txt2img_gallery img, #img2img_gallery img{
-    object-fit: scale-down;
-}
-#txt2img_actions_column, #img2img_actions_column {
-    gap: 0.5em;
+.my-4{
+    margin-top: 0;
+    margin-bottom: 0;
 }
-#txt2img_tools, #img2img_tools{
-    gap: 0.4em;
+
+#resize_mode{
+    flex: 1.5;
 }
 
-.interrogate-col{
-    min-width: 0 !important;
-    max-width: fit-content;
-    gap: 0.5em;
+button{
+    align-self: stretch !important;
 }
-.interrogate-col > button{
-    flex: 1;
+
+.overflow-hidden, .gr-panel{
+    overflow: visible !important;
 }
 
-.generate-box{
-    position: relative;
+#x_type, #y_type{
+    max-width: 10em;
 }
-.gradio-button.generate-box-skip, .gradio-button.generate-box-interrupt{
+
+#txt2img_preview, #img2img_preview, #ti_preview{
     position: absolute;
-    width: 50%;
-    height: 100%;
-    display: none;
-    background: #b4c0cc;
-}
-.gradio-button.generate-box-skip:hover, .gradio-button.generate-box-interrupt:hover{
-    background: #c2cfdb;
-}
-.gradio-button.generate-box-interrupt{
+    width: 320px;
     left: 0;
-    border-radius: 0.5rem 0 0 0.5rem;
-}
-.gradio-button.generate-box-skip{
     right: 0;
-    border-radius: 0 0.5rem 0.5rem 0;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 34px;
+    z-index: 100;
+    border: none;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
 }
 
-#txtimg_hr_finalres{
-    min-height: 0 !important;
-    padding: .625rem .75rem;
-    margin-left: -0.75em
+@media screen and (min-width: 768px) {
+    #txt2img_preview, #img2img_preview, #ti_preview {
+        position: absolute;
+    }
 }
 
-#txtimg_hr_finalres .resolution{
-    font-weight: bold;
+@media screen and (max-width: 767px) {
+    #txt2img_preview, #img2img_preview, #ti_preview {
+        position: relative;
+    }
 }
 
-.inactive{
-    opacity: 0.5;
+#txt2img_preview div.left-0.top-0, #img2img_preview div.left-0.top-0, #ti_preview div.left-0.top-0{
+    display: none;
 }
 
-[id$=_column_batch]{
-    min-width: min(13.5em, 100%) !important;
-}
+fieldset span.text-gray-500, .gr-block.gr-box span.text-gray-500,  label.block span{
+    position: absolute;
+    top: -0.7em;
+    line-height: 1.2em;
+    padding: 0;
+    margin: 0 0.5em;
 
-div.dimensions-tools{
-    min-width: 0 !important;
-    max-width: fit-content;
-    flex-direction: row;
-    align-content: center;
-}
+    background-color: white;
+    box-shadow:  6px 0 6px 0px white, -6px 0 6px 0px white;
 
-#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;
+    z-index: 300;
 }
 
-.image-buttons button{
-    min-width: auto;
+.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span{
+    background-color: rgb(31, 41, 55);
+    box-shadow: none;
+    border: 1px solid rgba(128, 128, 128, 0.1);
+    border-radius: 6px;
+    padding: 0.1em 0.5em;
 }
 
-.infotext {
-    overflow-wrap: break-word;
+#txt2img_column_batch, #img2img_column_batch{
+    min-width: min(13.5em, 100%) !important;
 }
 
-/* settings */
-#quicksettings {
-    width: fit-content;
+#settings fieldset span.text-gray-500, #settings .gr-block.gr-box span.text-gray-500, #settings label.block span{
+    position: relative;
+    border: none;
+    margin-right: 8em;
 }
 
-#quicksettings > div, #quicksettings > fieldset{
-    max-width: 24em;
-    min-width: 24em;
-    padding: 0;
-    border: none;
-    box-shadow: none;
-    background: none;
+#settings .gr-panel div.flex-col div.justify-between div{
+    position: relative;
+    z-index: 200;
 }
 
 #settings{
@@ -322,18 +276,17 @@ div.dimensions-tools{
     margin-left: 10em;
 }
 
-#settings > div.tab-nav{
+#settings > div.flex-wrap{
     float: left;
     display: block;
     margin-left: 0;
     width: 10em;
 }
 
-#settings > div.tab-nav button{
+#settings > div.flex-wrap button{
     display: block;
     border: none;
     text-align: left;
-    white-space: initial;
 }
 
 #settings_result{
@@ -341,8 +294,29 @@ div.dimensions-tools{
     margin: 0 1.2em;
 }
 
+input[type="range"]{
+    margin: 0.5em 0 -0.3em 0;
+}
+
+#mask_bug_info {
+  text-align: center;
+  display: block;
+  margin-top: -0.75em;
+  margin-bottom: -0.75em;
+}
+
+#txt2img_negative_prompt, #img2img_negative_prompt{
+}
+
+/* gradio 3.8 adds opacity to progressbar which makes it blink; disable it here */
+.transition.opacity-20 {
+  opacity: 1 !important;
+}
+
+/* more gradio's garbage cleanup */
+.min-h-\[4rem\] { min-height: unset !important; }
+.min-h-\[6rem\] { min-height: unset !important; }
 
-/* live preview */
 .progressDiv{
     position: relative;
     height: 20px;
@@ -388,8 +362,6 @@ div.dimensions-tools{
     height: 100%;
 }
 
-/* fullscreen popup (ie in Lora's (i) button) */
-
 .popup-metadata{
     color: black;
     background: white;
@@ -430,54 +402,87 @@ div.dimensions-tools{
     padding: 2em;
 }
 
-/* fullpage image viewer */
-
 #lightboxModal{
-    display: none;
-    position: fixed;
-    z-index: 1001;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-    background-color: rgba(20, 20, 20, 0.95);
-    user-select: none;
-    -webkit-user-select: none;
-    flex-direction: column;
+  display: none;
+  position: fixed;
+  z-index: 1001;
+  padding-top: 100px;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgba(20, 20, 20, 0.95);
+  user-select: none;
+  -webkit-user-select: none;
 }
 
 .modalControls {
-    display: flex;
-    gap: 1em;
-    padding: 1em;
+    display: grid;
+    grid-template-columns: 32px 32px 32px 1fr 32px;
+    grid-template-areas: "zoom tile save space close";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    padding: 16px;
+    gap: 16px;
     background-color: rgba(0,0,0,0.2);
 }
+
 .modalClose {
-    margin-left: auto;
+    grid-area: close;
+}
+
+.modalZoom {
+    grid-area: zoom;
 }
-.modalControls span{
+
+.modalSave {
+    grid-area: save;
+}
+
+.modalTileImage {
+    grid-area: tile;
+}
+
+.modalClose,
+.modalZoom,
+.modalTileImage {
+  color: white;
+  font-size: 35px;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+.modalSave {
     color: white;
-    font-size: 35px;
+    font-size: 28px;
+    margin-top: 8px;
     font-weight: bold;
     cursor: pointer;
-    width: 1em;
 }
 
-.modalControls span:hover, .modalControls span:focus{
-    color: #999;
-    text-decoration: none;
+.modalClose:hover,
+.modalClose:focus,
+.modalSave:hover,
+.modalSave:focus,
+.modalZoom:hover,
+.modalZoom:focus {
+  color: #999;
+  text-decoration: none;
+  cursor: pointer;
 }
 
-#lightboxModal > img {
+#modalImage {
     display: block;
     margin: auto;
     width: auto;
 }
 
-#lightboxModal > img.modalImageFullscreen{
+.modalImageFullscreen {
     object-fit: contain;
-    height: 100%;
+    height: 90%;
 }
 
 .modalPrev,
@@ -507,7 +512,45 @@ div.dimensions-tools{
   background-color: rgba(0, 0, 0, 0.8);
 }
 
-/* context menu (ie for the generate button) */
+#imageARPreview{
+    position:absolute;
+    top:0px;
+    left:0px;
+    border:2px solid red;
+    background:rgba(255, 0, 0, 0.3);
+    z-index: 900;
+    pointer-events:none;
+    display:none
+}
+
+#txt2img_generate_box, #img2img_generate_box{
+    position: relative;
+}
+
+#txt2img_interrupt, #img2img_interrupt, #txt2img_skip, #img2img_skip{
+    position: absolute;
+    width: 50%;
+    height: 100%;
+    background: #b4c0cc;
+    display: none;
+}
+
+#txt2img_interrupt, #img2img_interrupt{
+    left: 0;
+    border-radius: 0.5rem 0 0 0.5rem;
+}
+#txt2img_skip, #img2img_skip{
+    right: 0;
+    border-radius: 0 0.5rem 0.5rem 0;
+}
+
+.red {
+	color: red;
+}
+
+.gallery-item {
+    --tw-bg-opacity: 0 !important;
+}
 
 #context-menu{
     z-index:9999;
@@ -536,8 +579,61 @@ div.dimensions-tools{
     background: #a55000;
 }
 
+#quicksettings {
+    width: fit-content;
+}
+
+#quicksettings > div, #quicksettings > fieldset{
+    max-width: 24em;
+    min-width: 24em;
+    padding: 0;
+    border: none;
+    box-shadow: none;
+    background: none;
+    margin-right: 10px;
+}
+
+#quicksettings > div > div > div > label > span {
+    position: relative;
+    margin-right: 9em;
+    margin-bottom: -1em;
+}
+
+canvas[key="mask"] {
+    z-index: 12 !important;
+    filter: invert();
+    mix-blend-mode: multiply;
+    pointer-events: none;
+}
+
+
+/* gradio 3.4.1 stuff for editable scrollbar values */
+.gr-box > div > div > input.gr-text-input{
+    position: absolute;
+    right: 0.5em;
+    top: -0.6em;
+    z-index: 400;
+    width: 6em;
+}
+#quicksettings .gr-box > div > div > input.gr-text-input {
+  top: -1.12em;
+}
+
+.row.gr-compact{
+    overflow: visible;
+}
+
+#img2img_image, #img2img_image > .h-60, #img2img_image > .h-60 > div, #img2img_image > .h-60 > div > img,
+#img2img_sketch, #img2img_sketch > .h-60, #img2img_sketch > .h-60 > div, #img2img_sketch > .h-60 > div > img,
+#img2maskimg, #img2maskimg > .h-60, #img2maskimg > .h-60 > div, #img2maskimg > .h-60 > div > img,
+#inpaint_sketch, #inpaint_sketch > .h-60, #inpaint_sketch > .h-60 > div, #inpaint_sketch > .h-60 > div > img
+{
+    height: 480px !important;
+    max-height: 480px !important;
+    min-height: 480px !important;
+}
 
-/* extensions */
+/* Extensions */
 
 #tab_extensions table{
     border-collapse: collapse;
@@ -550,7 +646,6 @@ div.dimensions-tools{
 
 #tab_extensions table input[type="checkbox"]{
     margin-right: 0.5em;
-    appearance: checkbox;
 }
 
 #tab_extensions button{
@@ -575,7 +670,74 @@ div.dimensions-tools{
     font-size: 90%;
 }
 
-/* replace original footer with ours */
+#image_buttons_txt2img button, #image_buttons_img2img button, #image_buttons_extras button{
+    min-width: auto;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
+}
+
+.gr-form{
+    background-color: white;
+}
+
+.dark .gr-form{
+    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+}
+
+.gr-button-tool, .gr-button-tool-top{
+    max-width: 2.5em;
+    min-width: 2.5em !important;
+    height: 2.4em;
+}
+
+.gr-button-tool{
+    margin: 0.6em 0em 0.55em 0;
+}
+
+.gr-button-tool-top, #settings .gr-button-tool{
+    margin: 1.6em 0.7em 0.55em 0;
+}
+
+
+#modelmerger_results_container{
+    margin-top: 1em;
+    overflow: visible;
+}
+
+#modelmerger_models{
+    gap: 0;
+}
+
+
+#quicksettings .gr-button-tool{
+    margin: 0;
+    border-color: unset;
+	background-color: unset;
+}
+
+#modelmerger_interp_description>p {
+    margin: 0!important;
+    text-align: center;
+}
+#modelmerger_interp_description {
+    margin: 0.35rem 0.75rem 1.23rem;
+}
+#img2img_settings > div.gr-form, #txt2img_settings > div.gr-form {
+    padding-top: 0.9em;
+    padding-bottom: 0.9em;
+}
+#txt2img_settings {
+    padding-top: 1.16em;
+    padding-bottom: 0.9em;
+}
+#img2img_settings {
+    padding-bottom: 0.9em;
+}
+
+#img2img_settings div.gr-form .gr-form, #txt2img_settings div.gr-form .gr-form, #train_tabs div.gr-form .gr-form{
+    border: none;
+    padding-bottom: 0.5em;
+}
 
 footer {
     display: none !important;
@@ -594,7 +756,99 @@ footer {
     opacity: 0.85;
 }
 
-/* extra networks UI */
+#txtimg_hr_finalres{
+    min-height: 0 !important;
+    padding: .625rem .75rem;
+    margin-left: -0.75em
+}
+
+#txtimg_hr_finalres .resolution{
+    font-weight: bold;
+}
+
+#txt2img_checkboxes, #img2img_checkboxes{
+    margin-bottom: 0.5em;
+    margin-left: 0em;
+}
+#txt2img_checkboxes > div, #img2img_checkboxes > div{
+    flex: 0;
+    white-space: nowrap;
+    min-width: auto;
+}
+
+#img2img_finalres{
+    min-height: 0 !important;
+    padding: .625rem .75rem;
+    margin-left: -0.75em
+}
+
+#img2img_finalres .resolution{
+    font-weight: bold;
+}
+
+#img2img_copy_to_img2img, #img2img_copy_to_sketch, #img2img_copy_to_inpaint, #img2img_copy_to_inpaint_sketch{
+    margin-left: 0em;
+}
+
+#axis_options {
+    margin-left: 0em;
+}
+
+.inactive{
+    opacity: 0.5;
+}
+
+[id*='_prompt_container']{
+    gap: 0;
+}
+
+[id*='_prompt_container'] > div{
+    margin: -0.4em 0 0 0;
+}
+
+.gr-compact {
+    border: none;
+}
+
+.dark .gr-compact{
+    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
+	margin-left: 0;
+}
+
+.gr-compact{
+    overflow: visible;
+}
+
+.gr-compact > *{
+}
+
+.gr-compact .gr-block, .gr-compact .gr-form{
+    border: none;
+    box-shadow: none;
+}
+
+.gr-compact .gr-box{
+    border-radius: .5rem !important;
+    border-width: 1px !important;
+}
+
+#mode_img2img > div > div{
+    gap: 0 !important;
+}
+
+[id*='img2img_copy_to_'] {
+    border: none;
+}
+
+[id*='img2img_copy_to_'] > button {
+}
+
+[id*='img2img_label_copy_to_'] {
+    font-size: 1.0em;
+    font-weight: bold;
+    text-align: center;
+    line-height: 2.4em;
+}
 
 .extra-networks > div > [id *= '_extra_']{
     margin: 0.3em;
@@ -607,12 +861,12 @@ footer {
 .extra-network-subdirs button{
     margin: 0 0.15em;
 }
-.extra-networks .tab-nav .search{
+
+#txt2img_extra_networks .search, #img2img_extra_networks .search{
     display: inline-block;
     max-width: 16em;
     margin: 0.3em;
     align-self: center;
-    width: 16em;
 }
 
 #txt2img_extra_view, #img2img_extra_view {
@@ -644,7 +898,6 @@ footer {
     text-shadow: 2px 2px 3px black;
     padding: 0.25em;
     font-size: 22pt;
-    width: 1.5em;
 }
 .extra-network-cards .card:hover .metadata-button, .extra-network-thumbs .card:hover .metadata-button{
     display: inline-block;
@@ -738,15 +991,12 @@ footer {
     left: 0;
     right: 0;
     padding: 0.5em;
+    color: white;
     background: rgba(0,0,0,0.5);
     box-shadow: 0 0 0.25em 0.25em rgba(0,0,0,0.5);
     text-shadow: 0 0 0.2em black;
 }
 
-.extra-network-cards .card .actions *{
-    color: white;
-}
-
 .extra-network-cards .card .actions:hover{
     box-shadow: 0 0 0.75em 0.75em rgba(0,0,0,0.5) !important;
 }
@@ -784,3 +1034,7 @@ footer {
 .extra-network-cards .card ul a:hover{
     color: red;
 }
+
+[id*='_prompt_container'] > div {
+	margin: 0!important;
+}
-- 
cgit v1.2.3


From 7ea5d395c44be208f654b07ec7993aa2952f2510 Mon Sep 17 00:00:00 2001
From: space-nuko <24979496+space-nuko@users.noreply.github.com>
Date: Sun, 19 Feb 2023 03:45:43 -0800
Subject: Add upscaler to img2img

---
 style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'style.css')

diff --git a/style.css b/style.css
index 7d58b3b2..e824256f 100644
--- a/style.css
+++ b/style.css
@@ -779,7 +779,7 @@ footer {
 #img2img_finalres{
     min-height: 0 !important;
     padding: .625rem .75rem;
-    margin-left: -0.75em
+    margin-left: 0.25em
 }
 
 #img2img_finalres .resolution{
-- 
cgit v1.2.3


From c5f9f7c23759f9a74fa2b563451569c8926604ba Mon Sep 17 00:00:00 2001
From: space-nuko <24979496+space-nuko@users.noreply.github.com>
Date: Sat, 25 Mar 2023 14:26:36 -0400
Subject: Use .success() callback on img2img preview inputs change

---
 style.css | 772 +++++++++++++++++++++-----------------------------------------
 1 file changed, 259 insertions(+), 513 deletions(-)

(limited to 'style.css')

diff --git a/style.css b/style.css
index e824256f..84405622 100644
--- a/style.css
+++ b/style.css
@@ -1,270 +1,316 @@
-.container {
-    max-width: 100%;
-}
 
-.token-counter{
-    position: absolute;
-    display: inline-block;
-    right: 2em;
-    min-width: 0 !important;
-    width: auto;
-    z-index: 100;
-}
+/* general gradio fixes */
 
-.token-counter.error span{
-    box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075);
-    border: 2px solid rgba(255,0,0,0.4) !important;
+:root, .dark{
+    --checkbox-label-gap: 0.25em 0.1em;
+    --section-header-text-size: 12pt;
+    --block-background-fill: transparent;
 }
 
-.token-counter div{
-    display: inline;
+.block.padded{
+    padding: 0 !important;
 }
 
-.token-counter span{
-    padding: 0.1em 0.75em;
+div.gradio-container{
+    max-width: unset !important;
 }
 
-#sh{
-    min-width: 2em;
-    min-height: 2em;
-    max-width: 2em;
-    max-height: 2em;
-    flex-grow: 0;
-    padding-left: 0.25em;
-    padding-right: 0.25em;
-    margin: 0.1em 0;
-    opacity: 0%;
-    cursor: default;
+.hidden{
+    display: none;
 }
 
-.output-html p {margin: 0 0.5em;}
-
-.row > *,
-.row > .gr-form > * {
-    min-width: min(120px, 100%);
-    flex: 1 1 0%;
+.compact{
+    background: transparent !important;
+    padding: 0 !important;
 }
 
-.performance {
-    font-size: 0.85em;
-    color: #444;
+div.form{
+    border-width: 0;
+    box-shadow: none;
+    background: transparent;
+    overflow: visible;
+    gap: 0.5em;
 }
 
-.performance p{
-    display: inline-block;
+.block.gradio-dropdown,
+.block.gradio-slider,
+.block.gradio-checkbox,
+.block.gradio-textbox,
+.block.gradio-radio,
+.block.gradio-checkboxgroup,
+.block.gradio-number,
+.block.gradio-colorpicker
+{
+    border-width: 0 !important;
+    box-shadow: none !important;
 }
 
-.performance .time {
-    margin-right: 0;
+.gap.compact{
+    padding: 0;
+    gap: 0.2em 0;
 }
 
-.performance .vram {
+div.compact{
+    gap: 1em;
 }
 
-#txt2img_generate, #img2img_generate {
-    min-height: 4.5em;
+.gradio-dropdown ul.options{
+    z-index: 3000;
 }
 
-@media screen and (min-width: 2500px) {
-    #txt2img_gallery, #img2img_gallery {
-        min-height: 768px;
-    }
+.gradio-dropdown label span:not(.has-info),
+.gradio-textbox label span:not(.has-info),
+.gradio-number label span:not(.has-info)
+{
+    margin-bottom: 0;
 }
 
-#txt2img_gallery img, #img2img_gallery img{
-    object-fit: scale-down;
+.gradio-dropdown div.wrap.wrap.wrap.wrap{
+    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
-#txt2img_actions_column, #img2img_actions_column {
-	margin: 0.35rem 0.75rem 0.35rem 0;	
+
+.gradio-dropdown .wrap-inner.wrap-inner.wrap-inner{
+    flex-wrap: unset;
 }
-#script_list {
-    padding: .625rem .75rem 0 .625rem;
+
+.gradio-dropdown .single-select{
+    white-space: nowrap;
+    overflow: hidden;
 }
-.justify-center.overflow-x-scroll {
-    justify-content: left;
+
+.gradio-dropdown .token-remove.remove-all.remove-all{
+    display: none;
 }
 
-.justify-center.overflow-x-scroll button:first-of-type {
-    margin-left: auto;
+.gradio-dropdown.multiselect .token-remove.remove-all.remove-all{
+    display: flex;
 }
 
-.justify-center.overflow-x-scroll button:last-of-type {
-    margin-right: auto;
+.gradio-slider input[type="number"]{
+    width: 6em;
 }
 
-[id$=_random_seed], [id$=_random_subseed], [id$=_reuse_seed], [id$=_reuse_subseed], #open_folder{
-    min-width: 2.3em;
-    height: 2.5em;
-    flex-grow: 0;
-    padding-left: 0.25em;
-    padding-right: 0.25em;
+.block.gradio-checkbox {
+    margin: 0.75em 1.5em 0 0;
 }
 
-#hidden_element{
-    display: none;
+.gradio-html div.wrap{
+    height: 100%;
+}
+div.gradio-html.min{
+    min-height: 0;
 }
 
-[id$=_seed_row], [id$=_subseed_row]{
-    gap: 0.5rem;
-    padding: 0.6em;
+.block.gradio-gallery{
+    background: var(--input-background-fill);
 }
 
-[id$=_subseed_show_box]{
-    min-width: auto;
-    flex-grow: 0;
+.gradio-container .prose a, .gradio-container .prose a:visited{
+    color: unset;
+    text-decoration: none;
 }
 
-[id$=_subseed_show_box] > div{
-    border: 0;
-    height: 100%;
+
+
+/* general styled components */
+
+.gradio-button.tool{
+    max-width: 2.2em;
+    min-width: 2.2em !important;
+    height: 2.4em;
+    align-self: end;
+    line-height: 1em;
+    border-radius: 0.5em;
 }
 
-[id$=_subseed_show]{
+.checkboxes-row{
+    margin-bottom: 0.5em;
+    margin-left: 0em;
+}
+.checkboxes-row > div{
+    flex: 0;
+    white-space: nowrap;
     min-width: auto;
-    flex-grow: 0;
-    padding: 0;
 }
 
-[id$=_subseed_show] label{
-    height: 100%;
+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;
 }
 
-#txt2img_actions_column, #img2img_actions_column{
-    gap: 0;
-    margin-right: .75rem;
-}
 
-#txt2img_tools, #img2img_tools{
-    gap: 0.4em;
-}
+/* txt2img/img2img specific */
 
-#interrogate_col{
+.block.token-counter{
+    position: absolute;
+    display: inline-block;
+    right: 1em;
     min-width: 0 !important;
-    max-width: 8em !important;
-    margin-right: 1em;
-    gap: 0;
+    width: auto;
+    z-index: 100;
+    top: -0.75em;
 }
-#interrogate, #deepbooru{
-    margin: 0em 0.25em 0.5em 0.25em;
-    min-width: 8em;
-    max-width: 8em;
+
+.block.token-counter span{
+    background: var(--input-background-fill) !important;
+    box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075);
+    border: 2px solid rgba(192,192,192,0.4) !important;
+    border-radius: 0.4em;
 }
 
-#style_pos_col, #style_neg_col{
-    min-width: 8em !important;
+.block.token-counter.error span{
+    box-shadow: 0 0 0.0 0.3em rgba(255,0,0,0.15), inset 0 0 0.6em rgba(255,0,0,0.075);
+    border: 2px solid rgba(255,0,0,0.4) !important;
 }
 
-#txt2img_styles_row, #img2img_styles_row{
-    gap: 0.25em;
-    margin-top: 0.3em;
+.block.token-counter div{
+    display: inline;
 }
 
-#txt2img_styles_row > button, #img2img_styles_row > button{
-    margin: 0;
+.block.token-counter span{
+    padding: 0.1em 0.75em;
 }
 
-#txt2img_styles, #img2img_styles{
-    padding: 0;
+[id$=_subseed_show]{
+    min-width: auto !important;
+    flex-grow: 0 !important;
+    display: flex;
 }
 
-#txt2img_styles > label > div, #img2img_styles > label > div{
-    min-height: 3.2em;
+[id$=_subseed_show] label{
+    margin-bottom: 0.5em;
+    align-self: end;
 }
 
-ul.list-none{
-    max-height: 35em;
-    z-index: 2000;
+.performance {
+    font-size: 0.85em;
+    color: #444;
 }
 
-.gr-form{
-    background: transparent;
+.performance p{
+    display: inline-block;
 }
 
-.my-4{
-    margin-top: 0;
-    margin-bottom: 0;
+.performance .time {
+    margin-right: 0;
 }
 
-#resize_mode{
-    flex: 1.5;
+.performance .vram {
 }
 
-button{
-    align-self: stretch !important;
+#txt2img_generate, #img2img_generate {
+    min-height: 4.5em;
 }
 
-.overflow-hidden, .gr-panel{
-    overflow: visible !important;
+@media screen and (min-width: 2500px) {
+    #txt2img_gallery, #img2img_gallery {
+        min-height: 768px;
+    }
 }
 
-#x_type, #y_type{
-    max-width: 10em;
+#txt2img_gallery img, #img2img_gallery img{
+    object-fit: scale-down;
+}
+#txt2img_actions_column, #img2img_actions_column {
+    gap: 0.5em;
+}
+#txt2img_tools, #img2img_tools{
+    gap: 0.4em;
 }
 
-#txt2img_preview, #img2img_preview, #ti_preview{
+.interrogate-col{
+    min-width: 0 !important;
+    max-width: fit-content;
+    gap: 0.5em;
+}
+.interrogate-col > button{
+    flex: 1;
+}
+
+.generate-box{
+    position: relative;
+}
+.gradio-button.generate-box-skip, .gradio-button.generate-box-interrupt{
     position: absolute;
-    width: 320px;
+    width: 50%;
+    height: 100%;
+    display: none;
+    background: #b4c0cc;
+}
+.gradio-button.generate-box-skip:hover, .gradio-button.generate-box-interrupt:hover{
+    background: #c2cfdb;
+}
+.gradio-button.generate-box-interrupt{
     left: 0;
+    border-radius: 0.5rem 0 0 0.5rem;
+}
+.gradio-button.generate-box-skip{
     right: 0;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 34px;
-    z-index: 100;
-    border: none;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
+    border-radius: 0 0.5rem 0.5rem 0;
 }
 
-@media screen and (min-width: 768px) {
-    #txt2img_preview, #img2img_preview, #ti_preview {
-        position: absolute;
-    }
+#txtimg_hr_finalres, #img2img_finalres {
+    min-height: 0 !important;
+    padding: .625rem .75rem;
+    margin-left: -0.75em
 }
 
-@media screen and (max-width: 767px) {
-    #txt2img_preview, #img2img_preview, #ti_preview {
-        position: relative;
-    }
+#txtimg_hr_finalres .resolution, #img2img_finalres .resolution{
+    font-weight: bold;
 }
 
-#txt2img_preview div.left-0.top-0, #img2img_preview div.left-0.top-0, #ti_preview div.left-0.top-0{
-    display: none;
+.inactive{
+    opacity: 0.5;
 }
 
-fieldset span.text-gray-500, .gr-block.gr-box span.text-gray-500,  label.block span{
-    position: absolute;
-    top: -0.7em;
-    line-height: 1.2em;
-    padding: 0;
-    margin: 0 0.5em;
+[id$=_column_batch]{
+    min-width: min(13.5em, 100%) !important;
+}
 
-    background-color: white;
-    box-shadow:  6px 0 6px 0px white, -6px 0 6px 0px white;
+div.dimensions-tools{
+    min-width: 0 !important;
+    max-width: fit-content;
+    flex-direction: row;
+    align-content: center;
+}
 
-    z-index: 300;
+#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;
 }
 
-.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span{
-    background-color: rgb(31, 41, 55);
-    box-shadow: none;
-    border: 1px solid rgba(128, 128, 128, 0.1);
-    border-radius: 6px;
-    padding: 0.1em 0.5em;
+.image-buttons button{
+    min-width: auto;
 }
 
-#txt2img_column_batch, #img2img_column_batch{
-    min-width: min(13.5em, 100%) !important;
+.infotext {
+    overflow-wrap: break-word;
 }
 
-#settings fieldset span.text-gray-500, #settings .gr-block.gr-box span.text-gray-500, #settings label.block span{
-    position: relative;
-    border: none;
-    margin-right: 8em;
+/* settings */
+#quicksettings {
+    width: fit-content;
 }
 
-#settings .gr-panel div.flex-col div.justify-between div{
-    position: relative;
-    z-index: 200;
+#quicksettings > div, #quicksettings > fieldset{
+    max-width: 24em;
+    min-width: 24em;
+    padding: 0;
+    border: none;
+    box-shadow: none;
+    background: none;
 }
 
 #settings{
@@ -276,17 +322,18 @@ fieldset span.text-gray-500, .gr-block.gr-box span.text-gray-500,  label.block s
     margin-left: 10em;
 }
 
-#settings > div.flex-wrap{
+#settings > div.tab-nav{
     float: left;
     display: block;
     margin-left: 0;
     width: 10em;
 }
 
-#settings > div.flex-wrap button{
+#settings > div.tab-nav button{
     display: block;
     border: none;
     text-align: left;
+    white-space: initial;
 }
 
 #settings_result{
@@ -294,29 +341,8 @@ fieldset span.text-gray-500, .gr-block.gr-box span.text-gray-500,  label.block s
     margin: 0 1.2em;
 }
 
-input[type="range"]{
-    margin: 0.5em 0 -0.3em 0;
-}
-
-#mask_bug_info {
-  text-align: center;
-  display: block;
-  margin-top: -0.75em;
-  margin-bottom: -0.75em;
-}
-
-#txt2img_negative_prompt, #img2img_negative_prompt{
-}
-
-/* gradio 3.8 adds opacity to progressbar which makes it blink; disable it here */
-.transition.opacity-20 {
-  opacity: 1 !important;
-}
-
-/* more gradio's garbage cleanup */
-.min-h-\[4rem\] { min-height: unset !important; }
-.min-h-\[6rem\] { min-height: unset !important; }
 
+/* live preview */
 .progressDiv{
     position: relative;
     height: 20px;
@@ -362,6 +388,8 @@ input[type="range"]{
     height: 100%;
 }
 
+/* fullscreen popup (ie in Lora's (i) button) */
+
 .popup-metadata{
     color: black;
     background: white;
@@ -402,87 +430,54 @@ input[type="range"]{
     padding: 2em;
 }
 
+/* fullpage image viewer */
+
 #lightboxModal{
-  display: none;
-  position: fixed;
-  z-index: 1001;
-  padding-top: 100px;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  overflow: auto;
-  background-color: rgba(20, 20, 20, 0.95);
-  user-select: none;
-  -webkit-user-select: none;
+    display: none;
+    position: fixed;
+    z-index: 1001;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background-color: rgba(20, 20, 20, 0.95);
+    user-select: none;
+    -webkit-user-select: none;
+    flex-direction: column;
 }
 
 .modalControls {
-    display: grid;
-    grid-template-columns: 32px 32px 32px 1fr 32px;
-    grid-template-areas: "zoom tile save space close";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    padding: 16px;
-    gap: 16px;
+    display: flex;
+    gap: 1em;
+    padding: 1em;
     background-color: rgba(0,0,0,0.2);
 }
-
 .modalClose {
-    grid-area: close;
-}
-
-.modalZoom {
-    grid-area: zoom;
-}
-
-.modalSave {
-    grid-area: save;
-}
-
-.modalTileImage {
-    grid-area: tile;
-}
-
-.modalClose,
-.modalZoom,
-.modalTileImage {
-  color: white;
-  font-size: 35px;
-  font-weight: bold;
-  cursor: pointer;
+    margin-left: auto;
 }
-
-.modalSave {
+.modalControls span{
     color: white;
-    font-size: 28px;
-    margin-top: 8px;
+    font-size: 35px;
     font-weight: bold;
     cursor: pointer;
+    width: 1em;
 }
 
-.modalClose:hover,
-.modalClose:focus,
-.modalSave:hover,
-.modalSave:focus,
-.modalZoom:hover,
-.modalZoom:focus {
-  color: #999;
-  text-decoration: none;
-  cursor: pointer;
+.modalControls span:hover, .modalControls span:focus{
+    color: #999;
+    text-decoration: none;
 }
 
-#modalImage {
+#lightboxModal > img {
     display: block;
     margin: auto;
     width: auto;
 }
 
-.modalImageFullscreen {
+#lightboxModal > img.modalImageFullscreen{
     object-fit: contain;
-    height: 90%;
+    height: 100%;
 }
 
 .modalPrev,
@@ -512,45 +507,7 @@ input[type="range"]{
   background-color: rgba(0, 0, 0, 0.8);
 }
 
-#imageARPreview{
-    position:absolute;
-    top:0px;
-    left:0px;
-    border:2px solid red;
-    background:rgba(255, 0, 0, 0.3);
-    z-index: 900;
-    pointer-events:none;
-    display:none
-}
-
-#txt2img_generate_box, #img2img_generate_box{
-    position: relative;
-}
-
-#txt2img_interrupt, #img2img_interrupt, #txt2img_skip, #img2img_skip{
-    position: absolute;
-    width: 50%;
-    height: 100%;
-    background: #b4c0cc;
-    display: none;
-}
-
-#txt2img_interrupt, #img2img_interrupt{
-    left: 0;
-    border-radius: 0.5rem 0 0 0.5rem;
-}
-#txt2img_skip, #img2img_skip{
-    right: 0;
-    border-radius: 0 0.5rem 0.5rem 0;
-}
-
-.red {
-	color: red;
-}
-
-.gallery-item {
-    --tw-bg-opacity: 0 !important;
-}
+/* context menu (ie for the generate button) */
 
 #context-menu{
     z-index:9999;
@@ -579,61 +536,8 @@ input[type="range"]{
     background: #a55000;
 }
 
-#quicksettings {
-    width: fit-content;
-}
-
-#quicksettings > div, #quicksettings > fieldset{
-    max-width: 24em;
-    min-width: 24em;
-    padding: 0;
-    border: none;
-    box-shadow: none;
-    background: none;
-    margin-right: 10px;
-}
 
-#quicksettings > div > div > div > label > span {
-    position: relative;
-    margin-right: 9em;
-    margin-bottom: -1em;
-}
-
-canvas[key="mask"] {
-    z-index: 12 !important;
-    filter: invert();
-    mix-blend-mode: multiply;
-    pointer-events: none;
-}
-
-
-/* gradio 3.4.1 stuff for editable scrollbar values */
-.gr-box > div > div > input.gr-text-input{
-    position: absolute;
-    right: 0.5em;
-    top: -0.6em;
-    z-index: 400;
-    width: 6em;
-}
-#quicksettings .gr-box > div > div > input.gr-text-input {
-  top: -1.12em;
-}
-
-.row.gr-compact{
-    overflow: visible;
-}
-
-#img2img_image, #img2img_image > .h-60, #img2img_image > .h-60 > div, #img2img_image > .h-60 > div > img,
-#img2img_sketch, #img2img_sketch > .h-60, #img2img_sketch > .h-60 > div, #img2img_sketch > .h-60 > div > img,
-#img2maskimg, #img2maskimg > .h-60, #img2maskimg > .h-60 > div, #img2maskimg > .h-60 > div > img,
-#inpaint_sketch, #inpaint_sketch > .h-60, #inpaint_sketch > .h-60 > div, #inpaint_sketch > .h-60 > div > img
-{
-    height: 480px !important;
-    max-height: 480px !important;
-    min-height: 480px !important;
-}
-
-/* Extensions */
+/* extensions */
 
 #tab_extensions table{
     border-collapse: collapse;
@@ -646,6 +550,7 @@ canvas[key="mask"] {
 
 #tab_extensions table input[type="checkbox"]{
     margin-right: 0.5em;
+    appearance: checkbox;
 }
 
 #tab_extensions button{
@@ -670,74 +575,7 @@ canvas[key="mask"] {
     font-size: 90%;
 }
 
-#image_buttons_txt2img button, #image_buttons_img2img button, #image_buttons_extras button{
-    min-width: auto;
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-}
-
-.gr-form{
-    background-color: white;
-}
-
-.dark .gr-form{
-    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
-}
-
-.gr-button-tool, .gr-button-tool-top{
-    max-width: 2.5em;
-    min-width: 2.5em !important;
-    height: 2.4em;
-}
-
-.gr-button-tool{
-    margin: 0.6em 0em 0.55em 0;
-}
-
-.gr-button-tool-top, #settings .gr-button-tool{
-    margin: 1.6em 0.7em 0.55em 0;
-}
-
-
-#modelmerger_results_container{
-    margin-top: 1em;
-    overflow: visible;
-}
-
-#modelmerger_models{
-    gap: 0;
-}
-
-
-#quicksettings .gr-button-tool{
-    margin: 0;
-    border-color: unset;
-	background-color: unset;
-}
-
-#modelmerger_interp_description>p {
-    margin: 0!important;
-    text-align: center;
-}
-#modelmerger_interp_description {
-    margin: 0.35rem 0.75rem 1.23rem;
-}
-#img2img_settings > div.gr-form, #txt2img_settings > div.gr-form {
-    padding-top: 0.9em;
-    padding-bottom: 0.9em;
-}
-#txt2img_settings {
-    padding-top: 1.16em;
-    padding-bottom: 0.9em;
-}
-#img2img_settings {
-    padding-bottom: 0.9em;
-}
-
-#img2img_settings div.gr-form .gr-form, #txt2img_settings div.gr-form .gr-form, #train_tabs div.gr-form .gr-form{
-    border: none;
-    padding-bottom: 0.5em;
-}
+/* replace original footer with ours */
 
 footer {
     display: none !important;
@@ -756,99 +594,7 @@ footer {
     opacity: 0.85;
 }
 
-#txtimg_hr_finalres{
-    min-height: 0 !important;
-    padding: .625rem .75rem;
-    margin-left: -0.75em
-}
-
-#txtimg_hr_finalres .resolution{
-    font-weight: bold;
-}
-
-#txt2img_checkboxes, #img2img_checkboxes{
-    margin-bottom: 0.5em;
-    margin-left: 0em;
-}
-#txt2img_checkboxes > div, #img2img_checkboxes > div{
-    flex: 0;
-    white-space: nowrap;
-    min-width: auto;
-}
-
-#img2img_finalres{
-    min-height: 0 !important;
-    padding: .625rem .75rem;
-    margin-left: 0.25em
-}
-
-#img2img_finalres .resolution{
-    font-weight: bold;
-}
-
-#img2img_copy_to_img2img, #img2img_copy_to_sketch, #img2img_copy_to_inpaint, #img2img_copy_to_inpaint_sketch{
-    margin-left: 0em;
-}
-
-#axis_options {
-    margin-left: 0em;
-}
-
-.inactive{
-    opacity: 0.5;
-}
-
-[id*='_prompt_container']{
-    gap: 0;
-}
-
-[id*='_prompt_container'] > div{
-    margin: -0.4em 0 0 0;
-}
-
-.gr-compact {
-    border: none;
-}
-
-.dark .gr-compact{
-    background-color: rgb(31 41 55 / var(--tw-bg-opacity));
-	margin-left: 0;
-}
-
-.gr-compact{
-    overflow: visible;
-}
-
-.gr-compact > *{
-}
-
-.gr-compact .gr-block, .gr-compact .gr-form{
-    border: none;
-    box-shadow: none;
-}
-
-.gr-compact .gr-box{
-    border-radius: .5rem !important;
-    border-width: 1px !important;
-}
-
-#mode_img2img > div > div{
-    gap: 0 !important;
-}
-
-[id*='img2img_copy_to_'] {
-    border: none;
-}
-
-[id*='img2img_copy_to_'] > button {
-}
-
-[id*='img2img_label_copy_to_'] {
-    font-size: 1.0em;
-    font-weight: bold;
-    text-align: center;
-    line-height: 2.4em;
-}
+/* extra networks UI */
 
 .extra-networks > div > [id *= '_extra_']{
     margin: 0.3em;
@@ -861,12 +607,12 @@ footer {
 .extra-network-subdirs button{
     margin: 0 0.15em;
 }
-
-#txt2img_extra_networks .search, #img2img_extra_networks .search{
+.extra-networks .tab-nav .search{
     display: inline-block;
     max-width: 16em;
     margin: 0.3em;
     align-self: center;
+    width: 16em;
 }
 
 #txt2img_extra_view, #img2img_extra_view {
@@ -898,6 +644,7 @@ footer {
     text-shadow: 2px 2px 3px black;
     padding: 0.25em;
     font-size: 22pt;
+    width: 1.5em;
 }
 .extra-network-cards .card:hover .metadata-button, .extra-network-thumbs .card:hover .metadata-button{
     display: inline-block;
@@ -991,12 +738,15 @@ footer {
     left: 0;
     right: 0;
     padding: 0.5em;
-    color: white;
     background: rgba(0,0,0,0.5);
     box-shadow: 0 0 0.25em 0.25em rgba(0,0,0,0.5);
     text-shadow: 0 0 0.2em black;
 }
 
+.extra-network-cards .card .actions *{
+    color: white;
+}
+
 .extra-network-cards .card .actions:hover{
     box-shadow: 0 0 0.75em 0.75em rgba(0,0,0,0.5) !important;
 }
@@ -1034,7 +784,3 @@ footer {
 .extra-network-cards .card ul a:hover{
     color: red;
 }
-
-[id*='_prompt_container'] > div {
-	margin: 0!important;
-}
-- 
cgit v1.2.3


From 4b4902050684dc4db1bbd007a4f2e8f7c37bf1a4 Mon Sep 17 00:00:00 2001
From: zetclansu <zetclansu@ya.ru>
Date: Mon, 27 Mar 2023 21:05:56 +0300
Subject: Update style.css

Fix for wide width image in img2img_sketch, img2maskimg, inpaint_sketch
---
 style.css | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'style.css')

diff --git a/style.css b/style.css
index 5e8fb533..be6ceb1e 100644
--- a/style.css
+++ b/style.css
@@ -318,6 +318,13 @@ div.dimensions-tools{
     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;
 }
-- 
cgit v1.2.3


From b3e593edcb72c0431a50b423fe7aa88a0daf2a90 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Mon, 27 Mar 2023 16:38:42 -0600
Subject: Fix quicksettings alignment

---
 style.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'style.css')

diff --git a/style.css b/style.css
index 5e8fb533..4827a9a1 100644
--- a/style.css
+++ b/style.css
@@ -329,6 +329,7 @@ div.dimensions-tools{
 /* settings */
 #quicksettings {
     width: fit-content;
+    align-items: end;
 }
 
 #quicksettings > div, #quicksettings > fieldset{
-- 
cgit v1.2.3


From 433b3ab7017556a19173a86d1215ed0a0b5b1396 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 28 Mar 2023 20:36:57 +0300
Subject: Revert "Merge pull request #7931 from space-nuko/img2img-enhance"

This reverts commit 426875937048e21305ac24bea53df06523bdaa81, reversing
changes made to 1b63afbedc7789c0eb9a4742b780ab304d7a9caf.
---
 style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'style.css')

diff --git a/style.css b/style.css
index 379a89dc..de16a7f2 100644
--- a/style.css
+++ b/style.css
@@ -287,13 +287,13 @@ button.custom-button{
     border-radius: 0 0.5rem 0.5rem 0;
 }
 
-#txtimg_hr_finalres, #img2img_finalres {
+#txtimg_hr_finalres{
     min-height: 0 !important;
     padding: .625rem .75rem;
     margin-left: -0.75em
 }
 
-#txtimg_hr_finalres .resolution, #img2img_finalres .resolution{
+#txtimg_hr_finalres .resolution{
     font-weight: bold;
 }
 
-- 
cgit v1.2.3


From a73f3bf0cfc89cde294b42f5c566017daf4b2ccd Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Thu, 30 Mar 2023 23:19:40 -0600
Subject: Change extras "scale to" to sliders

---
 style.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'style.css')

diff --git a/style.css b/style.css
index de16a7f2..aafc2362 100644
--- a/style.css
+++ b/style.css
@@ -312,6 +312,10 @@ div.dimensions-tools{
     align-content: center;
 }
 
+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;
-- 
cgit v1.2.3