summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-16 13:51:49 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-16 13:51:49 +0200
commitb75fe439e7beb99346d31c5dff0127a1c4942d30 (patch)
tree12f0ae453b7ba74b277198029ec884a1addf5a0e
parent4fbab3c12db8bc23c7a4891005c00f6f302ae9e3 (diff)
downloadnextcloud-server-b75fe439e7beb99346d31c5dff0127a1c4942d30.tar.gz
nextcloud-server-b75fe439e7beb99346d31c5dff0127a1c4942d30.zip
fix CSS for upload button - fixes #8939
-rw-r--r--apps/files/css/mobile.css5
-rw-r--r--apps/files/css/upload.css10
-rw-r--r--core/css/mobile.css5
3 files changed, 12 insertions, 8 deletions
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 5e7d3875536..a0b92ca6949 100644
--- 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 b28f2eac4ac..bdc258b5064 100644
--- 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 2e515957c80..d840cdafa26 100644
--- 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,