summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-12 11:39:04 +0200
committerVincent Petry <pvince81@owncloud.com>2015-10-14 14:56:08 +0200
commit9f052e44c80ee3db71ada7dd8d1190621d61592d (patch)
treecc0a22c15441737bb9d34c67d68cafeddb440f7d /apps
parent06bfe1139b0c450e3ed4e03a985dd88801c53f30 (diff)
downloadnextcloud-server-9f052e44c80ee3db71ada7dd8d1190621d61592d.tar.gz
nextcloud-server-9f052e44c80ee3db71ada7dd8d1190621d61592d.zip
Move trashbin specific CSS that modifies sidebar
Only when trashbin is enabled, its sidebar nav element must be fixed at the bottom.
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/files.css13
-rw-r--r--apps/files_trashbin/css/trash.css18
2 files changed, 18 insertions, 13 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d0a2cce1a86..bdb02c20546 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 15a9249d7b2..053e2e7002c 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;
+}
+