From 0738ddfb768c541e8a6b112fb2cd12d15676a0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 12 Oct 2015 13:59:29 +0200
Subject: [PATCH] Revert "Move trashbin specific CSS that modifies sidebar"

---
 apps/files/css/files.css          | 13 +++++++++++++
 apps/files_trashbin/css/trash.css | 18 ------------------
 core/css/apps.css                 |  1 +
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index bdb02c20546..d0a2cce1a86 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -85,6 +85,19 @@
 	background-image: url('../img/delete.svg');
 }
 
+/* move Deleted Files to bottom of sidebar */
+.nav-trashbin {
+	position: fixed !important;
+	bottom: 44px;
+	width: inherit !important;
+	background-color: #fff;
+	border-right: 1px solid #eee;
+}
+/* double padding to account for Deleted files entry, issue with Firefox */
+.app-files #app-navigation > ul li:nth-last-child(2) {
+	margin-bottom: 44px;
+}
+
 #app-navigation .nav-files a.nav-icon-files {
 	width: auto;
 }
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 053e2e7002c..15a9249d7b2 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -18,21 +18,3 @@
 #app-content-trashbin #filestable .summary .filesize {
 	display: none;
 }
-
-#app-navigation > ul {
-	padding-bottom: 44px;
-}
-
-/* move Deleted Files to bottom of sidebar */
-.nav-trashbin {
-	position: fixed !important;
-	bottom: 44px;
-	width: inherit !important;
-	background-color: #fff;
-	border-right: 1px solid #eee;
-}
-/* double padding to account for Deleted files entry, issue with Firefox */
-.app-files #app-navigation > ul li:nth-last-child(2) {
-	margin-bottom: 44px;
-}
-
diff --git a/core/css/apps.css b/core/css/apps.css
index 4d3d3e39a37..3122a2b48a1 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -35,6 +35,7 @@
 	height: 100%;
 	width: inherit;
 	overflow: auto;
+	padding-bottom: 44px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 #app-navigation li {