summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-06-06 11:27:04 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-06-06 11:27:04 +0200
commit289accc31bd2adb98833e470162483119924e2e9 (patch)
treea8547b7eb22d481f2752403b486ebe1e8636414a /apps/files
parent3a7b30795c56f1debdb7a9dcd51578b711c2f622 (diff)
parentb2bae9313d3467f945ef02a3091d8cbf52c1382a (diff)
downloadnextcloud-server-289accc31bd2adb98833e470162483119924e2e9.tar.gz
nextcloud-server-289accc31bd2adb98833e470162483119924e2e9.zip
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
Mobile sidebar swipe
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/css/files.css3
-rw-r--r--apps/files/css/upload.css3
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index c5c8edd0971..0392733f4ca 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -97,7 +97,7 @@
* to be more flexible / relative
*/
#body-user .app-files #controls {
- left: 230px; /* sidebar width */
+ left: 250px; /* sidebar width */
position: fixed;
padding-left: 0px;
}
@@ -105,7 +105,6 @@
/* this is mostly for file viewer apps, text editor, etc */
#body-user .app-files.no-sidebar #controls {
left: 0px;
- padding-left: 80px; /* main nav bar */
}
/* move Deleted Files to bottom of sidebar */
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index 06b4d4655fe..b28f2eac4ac 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;
}