Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 18 insertions, 23 deletions

diff --git a/style.css b/style.css
index 2306c002..33832ebf 100644
--- a/style.css
+++ b/style.css
@@ -115,7 +115,7 @@
     padding: 0.4em 0;

 }

 

-#roll, #paste{

+#roll, #paste, #style_create, #style_apply{

     min-width: 2em;

     min-height: 2em;

     max-width: 2em;

@@ -126,14 +126,14 @@
     margin: 0.1em 0;

 }

 

-#style_apply, #style_create, #interrogate{

-    margin: 0.75em 0.25em 0.25em 0.25em;

-    min-width: 5em;

+#interrogate_col{

+    min-width: 0 !important;

+    max-width: 8em !important;

 }

-

-#style_apply, #style_create, #deepbooru{

-    margin: 0.75em 0.25em 0.25em 0.25em;

-    min-width: 5em;

+#interrogate, #deepbooru{

+    margin: 0em 0.25em 0.9em 0.25em;

+    min-width: 8em;

+    max-width: 8em;

 }

 

 #style_pos_col, #style_neg_col{

@@ -167,10 +167,6 @@ button{
     align-self: stretch !important;

 }

 

-#img2maskimg .h-60{

-    height: 30rem;

-}

-

 .overflow-hidden, .gr-panel{

     overflow: visible !important;

 }

@@ -241,13 +237,6 @@ fieldset span.text-gray-500, .gr-block.gr-box span.text-gray-500,  label.block s
     margin: 0;

 }

 

-.gr-panel div.flex-col div.justify-between div{

-  position: absolute;

-  top: -0.1em;

-  right: 1em;

-  padding: 0 0.5em;

-}

-

 #settings .gr-panel div.flex-col div.justify-between div{

     position: relative;

     z-index: 200;

@@ -320,6 +309,8 @@ input[type="range"]{
   height: 100%;

   overflow: auto;

   background-color: rgba(20, 20, 20, 0.95);

+  user-select: none;

+  -webkit-user-select: none;

 }

 

 .modalControls {

@@ -443,10 +434,6 @@ input[type="range"]{
     --tw-bg-opacity: 0 !important;

 }

 

-#img2img_image div.h-60{

-    height: 480px;

-}

-

 #context-menu{

     z-index:9999;

     position:absolute;

@@ -521,3 +508,11 @@ canvas[key="mask"] {
 .row.gr-compact{

     overflow: visible;

 }

+

+#img2img_image, #img2img_image > .h-60, #img2img_image > .h-60 > div, #img2img_image > .h-60 > div > img,

+img2maskimg, #img2maskimg > .h-60, #img2maskimg > .h-60 > div, #img2maskimg > .h-60 > div > img

+{

+    height: 480px !important;

+    max-height: 480px !important;

+    min-height: 480px !important;

+}