From 990405d6eef3abfbe1becbad58e1c4fcf68db233 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 5 Jun 2014 17:21:49 +0200
Subject: [PATCH] fix position of sidebar toggle, fix Files controls position
 problems

---
 apps/files/css/upload.css |  3 +--
 core/css/mobile.css       | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index 06b4d4655f..b28f2eac4a 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -44,7 +44,6 @@
 	display: inline-block;
 	vertical-align: top;
 	height: 36px;
-	box-sizing: border-box;
 }
 #uploadprogresswrapper > input[type='button'] {
 	height: 36px;
@@ -53,7 +52,7 @@
 	position:relative;
 	float: left;
 	margin-left: 12px;
-	width: 130px;
+	width: 100%;
 	height: 36px;
 	display:inline-block;
 }
diff --git a/core/css/mobile.css b/core/css/mobile.css
index f36ec2e6f0..a4a289ebff 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -79,13 +79,13 @@
 	width: 100% !important;
 	left: 0 !important;
 	background-color: #fff;
-	overflow: hidden;
+	overflow-x: hidden !important;
 }
 
 #app-navigation-toggle {
-	position: absolute;
+	position: fixed;
 	display: inline-block !important;
-	top: 0;
+	top: 45px;
 	left: 0;
 	width: 44px;
 	height: 44px;
@@ -114,7 +114,16 @@ 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 {
+	top: 0;
+}
 .snapjs-left .app-files #controls,
 .snapjs-left #user-controls {
 	top: 0;