[Pkg-owncloud-commits] [owncloud] 157/223: fix CSS for upload button - fixes #8939

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit b75fe439e7beb99346d31c5dff0127a1c4942d30
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Jun 16 13:51:49 2014 +0200

    fix CSS for upload button - fixes #8939
---
 apps/files/css/mobile.css |  5 +++++
 apps/files/css/upload.css | 10 +++++++---
 core/css/mobile.css       |  5 -----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 5e7d387..a0b92ca 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 b28f2ea..bdc258b 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 2e51595..d840cda 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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git