Merge branch 'dev' into master

1 files changed, 43 insertions, 7 deletions

diff --git a/style.css b/style.css
index fb4e2f1f..73162022 100644
--- a/style.css
+++ b/style.css
@@ -83,8 +83,10 @@ div.compact{
     white-space: nowrap;

 }

 

-.gradio-dropdown ul.options li.item {

-    padding: 0.05em 0;

+@media (pointer:fine) {

+    .gradio-dropdown ul.options li.item {

+        padding: 0.05em 0;

+    }

 }

 

 .gradio-dropdown ul.options li.item.selected {

@@ -202,6 +204,11 @@ div.block.gradio-accordion {
     padding: 8px 8px;

 }

 

+input[type="checkbox"].input-accordion-checkbox{

+    vertical-align: sub;

+    margin-right: 0.5em;

+}

+

 

 /* txt2img/img2img specific */

 

@@ -289,6 +296,13 @@ div.block.gradio-accordion {
     min-height: 4.5em;

 }

 

+#txt2img_generate, #img2img_generate {

+    min-height: 4.5em;

+}

+.generate-box-compact #txt2img_generate, .generate-box-compact #img2img_generate {

+    min-height: 3em;

+}

+

 @media screen and (min-width: 2500px) {

     #txt2img_gallery, #img2img_gallery {

         min-height: 768px;

@@ -396,6 +410,15 @@ div#extras_scale_to_tab div.form{
     min-width: 0.5em;

 }

 

+div.toprow-compact-stylerow{

+    margin: 0.5em 0;

+}

+

+div.toprow-compact-tools{

+    min-width: fit-content !important;

+    max-width: fit-content;

+}

+

 /* settings */

 #quicksettings {

     align-items: end;

@@ -421,6 +444,7 @@ div#extras_scale_to_tab div.form{
 #settings > div{

     border: none;

     margin-left: 10em;

+    padding: 0 var(--spacing-xl);

 }

 

 #settings > div.tab-nav{

@@ -435,6 +459,7 @@ div#extras_scale_to_tab div.form{
     border: none;

     text-align: left;

     white-space: initial;

+    padding: 4px;

 }

 

 #settings_result{

@@ -516,7 +541,8 @@ table.popup-table .link{
     height: 20px;

     background: #b4c0cc;

     border-radius: 3px !important;

-    top: -20px;

+    top: -14px;

+    left: 0px;

     width: 100%;

 }

 

@@ -581,7 +607,6 @@ table.popup-table .link{
     width: 100%;

     height: 100%;

     overflow: auto;

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

 }

 

 .global-popup *{

@@ -590,9 +615,6 @@ table.popup-table .link{
 

 .global-popup-close:before {

     content: "×";

-}

-

-.global-popup-close{

     position: fixed;

     right: 0.25em;

     top: 0;

@@ -601,10 +623,20 @@ table.popup-table .link{
     font-size: 32pt;

 }

 

+.global-popup-close{

+    position: fixed;

+    left: 0;

+    top: 0;

+    width: 100%;

+    height: 100%;

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

+}

+

 .global-popup-inner{

     display: inline-block;

     margin: auto;

     padding: 2em;

+    z-index: 1001;

 }

 

 /* fullpage image viewer */

@@ -808,6 +840,10 @@ footer {
 

 /* extra networks UI */

 

+.extra-page .prompt{

+    margin: 0 0 0.5em 0;

+}

+

 .extra-network-cards{

     height: calc(100vh - 24rem);

     overflow: clip scroll;