From ccc9db6c540c8f4e443ffbd2e618b90eb5addf50 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 17 Mar 2015 18:42:11 +0100 Subject: [PATCH 1/3] add bottom padding to sidebar, fix last element being hidden below settings, fix #13264 --- core/css/apps.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/apps.css b/core/css/apps.css index a460bcf46c8..c5292a1e6c6 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -33,6 +33,7 @@ position: relative; height: 100%; overflow: auto; + padding-bottom: 44px; -moz-box-sizing: border-box; box-sizing: border-box; } #app-navigation li { From e5fd6816df55b8085bfef8891e16083dd4111bc1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 17 Mar 2015 18:44:18 +0100 Subject: [PATCH 2/3] fix position of 'Deleted files' sidebar entry, fix #10815 --- apps/files/css/files.css | 6 ++++-- core/css/apps.css | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 1d6b4ad9e07..d5f3d501d4b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -105,8 +105,10 @@ /* move Deleted Files to bottom of sidebar */ .nav-trashbin { - position: absolute !important; - bottom: 0; + position: fixed !important; + bottom: 44px; + width: inherit !important; + background-color: #f5f5f5; } #filestable tbody tr { background-color:#fff; height:40px; } diff --git a/core/css/apps.css b/core/css/apps.css index c5292a1e6c6..c36c833bfdd 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -32,6 +32,7 @@ #app-navigation > ul { position: relative; height: 100%; + width: inherit; overflow: auto; padding-bottom: 44px; -moz-box-sizing: border-box; box-sizing: border-box; From fcac7d8c1315ac7ab686233e2296329c865e1312 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 20 Mar 2015 17:49:41 +0100 Subject: [PATCH 3/3] double padding to account for Deleted files entry, issue with Firefox --- apps/files/css/files.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index d5f3d501d4b..6508a5c0bd6 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -110,6 +110,10 @@ width: inherit !important; background-color: #f5f5f5; } +/* double padding to account for Deleted files entry, issue with Firefox */ +.app-files #app-navigation > ul li:nth-last-child(2) { + margin-bottom: 44px; +} #filestable tbody tr { background-color:#fff; height:40px; } #filestable tbody tr:hover,