Merge branch 'dev' into tooltip

1 files changed, 31 insertions, 2 deletions

diff --git a/style.css b/style.css
index de16a7f2..57ddba0e 100644
--- a/style.css
+++ b/style.css
@@ -246,7 +246,7 @@ button.custom-button{
     }

 }

 

-#txt2img_gallery img, #img2img_gallery img{

+#txt2img_gallery img, #img2img_gallery img, #extras_gallery img{

     object-fit: scale-down;

 }

 #txt2img_actions_column, #img2img_actions_column {

@@ -293,7 +293,12 @@ button.custom-button{
     margin-left: -0.75em

 }

 

-#txtimg_hr_finalres .resolution{

+#img2img_scale_resolution_preview.block{

+    display: flex;

+    align-items: end;

+}

+

+#txtimg_hr_finalres .resolution, #img2img_scale_resolution_preview .resolution{

     font-weight: bold;

 }

 

@@ -312,6 +317,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;

@@ -333,6 +342,18 @@ div.dimensions-tools{
     overflow-wrap: break-word;

 }

 

+#img2img_column_batch{

+    align-self: end;

+    margin-bottom: 0.9em;

+}

+

+#img2img_unused_scale_by_slider{

+    visibility: hidden;

+    width: 0.5em;

+    max-width: 0.5em;

+    min-width: 0.5em;

+}

+

 /* settings */

 #quicksettings {

     width: fit-content;

@@ -513,6 +534,8 @@ div.dimensions-tools{
 #lightboxModal > img.modalImageFullscreen{

     object-fit: contain;

     height: 100%;

+    width: 100%;

+    min-height: 0;

 }

 

 .modalPrev,

@@ -642,6 +665,12 @@ footer {
 

 /* extra networks UI */

 

+.extra-network-cards{

+    height: 725px;

+    overflow: scroll;

+    resize: vertical;

+}

+

 .extra-networks > div > [id *= '_extra_']{

     margin: 0.3em;

 }