Merge pull request #9049 from owncloud/fix-upload-button

fix CSS for upload button - fixes #8939

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;
+}
 }

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;
 }

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,