[Pkg-owncloud-commits] [owncloud] 15/129: Move trashbin specific CSS that modifies sidebar

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 9f052e44c80ee3db71ada7dd8d1190621d61592d
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Oct 12 11:39:04 2015 +0200

    Move trashbin specific CSS that modifies sidebar
    
    Only when trashbin is enabled, its sidebar nav element must be fixed at
    the bottom.
---
 apps/files/css/files.css          | 13 -------------
 apps/files_trashbin/css/trash.css | 18 ++++++++++++++++++
 core/css/apps.css                 |  1 -
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d0a2cce..bdb02c2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -85,19 +85,6 @@
 	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 15a9249..053e2e7 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -18,3 +18,21 @@
 #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 3122a2b..4d3d3e3 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -35,7 +35,6 @@
 	height: 100%;
 	width: inherit;
 	overflow: auto;
-	padding-bottom: 44px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 #app-navigation li {

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