diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:49:56 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-14 12:49:56 +0200 |
| commit | 156108dcdb06d830428557ea443c63a01979621f (patch) | |
| tree | 0295636279cc4484257fa38d92baa1cd58218e65 | |
| parent | 28d6da815816b01c87dfc857dd6ca16c7cd6ead9 (diff) | |
| parent | 3444d620634effdf00fb8c364ae7dada797fbf82 (diff) | |
| download | nextcloud-server-156108dcdb06d830428557ea443c63a01979621f.tar.gz nextcloud-server-156108dcdb06d830428557ea443c63a01979621f.zip | |
Merge pull request #19714 from owncloud/trash-deletesectionposition-2
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
| -rw-r--r-- | apps/files/css/files.css | 13 | ||||
| -rw-r--r-- | apps/files_trashbin/css/trash.css | 18 | ||||
| -rw-r--r-- | 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 4afd7193d5e..9936c0b9f6c 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -87,19 +87,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; +} + diff --git a/core/css/apps.css b/core/css/apps.css index 3122a2b48a1..4d3d3e39a37 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 { |