fix CSS for upload button - fixes #8939

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 5e7d38755369f33ca857fdebee738b98cbabae1e..a0b92ca6949087dfaea372d14d9cb38d8c877a8c 100644 (file)
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -62,4 +62,9 @@ table td.filename .nametext .innernametext {
        display: -webkit-flex;
        display: flex;
 }
+
+/* shorten elements for mobile */
+#uploadprogressbar {
+       width: 50px;
+}
 }

diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index b28f2eac4acab335ba1e7afaeb57fb2dd45658e2..bdc258b5064102aca51164b7b5726033102cbbe4 100644 (file)
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -37,22 +37,26 @@
        overflow: hidden;
 }
 
-#uploadprogresswrapper {
+#uploadprogresswrapper, #uploadprogresswrapper * {
        -moz-box-sizing: border-box;
        -webkit-box-sizing: border-box;
        box-sizing: border-box;
+}
+
+#uploadprogresswrapper {
        display: inline-block;
        vertical-align: top;
        height: 36px;
+       margin-left: 3px;
 }
 #uploadprogresswrapper > input[type='button'] {
        height: 36px;
+       margin-left: 3px;
 }
 #uploadprogressbar {
        position:relative;
        float: left;
-       margin-left: 12px;
-       width: 100%;
+       width: 200px;
        height: 36px;
        display:inline-block;
 }

diff --git a/core/css/mobile.css b/core/css/mobile.css
index 2e515957c802693e0db768c0e2c8b2c552d8ba02..d840cdafa2683ab45944c2e9fe4e503f2c877c10 100644 (file)
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -129,11 +129,6 @@ table.multiselect thead {
        left: 0 !important;
 }
 
-/* shorten elements for mobile */
-#uploadprogresswrapper {
-       width: 50px;
-}
-
 
 /* fix controls bar jumping when navigation is slid out */
 .snapjs-left #app-navigation-toggle,