diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-08-10 13:14:15 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-08-10 13:14:15 +0200 |
| commit | 15e16d335db5771778477e944d4e63ac807382b9 (patch) | |
| tree | 597e7ea2f7adf12f257ccc78c04f90c06958aba3 /core/js/js.js | |
| parent | 214729a5524e2c406415985717c174bedc810954 (diff) | |
| parent | 038d29b8def77ad906a722f72a1501b369f9c1ee (diff) | |
| download | nextcloud-server-15e16d335db5771778477e944d4e63ac807382b9.tar.gz nextcloud-server-15e16d335db5771778477e944d4e63ac807382b9.zip | |
Merge pull request #17656 from owncloud/files-rightsidebar
Basic work for right sidebar
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index 45c9c90362f..72d4edd28dd 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1366,13 +1366,13 @@ function initCore() { // if there is a scrollbar … if($('#app-content').get(0).scrollHeight > $('#app-content').height()) { if($(window).width() > 768) { - controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth(); + controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width() - getScrollBarWidth(); } else { controlsWidth = $('#content').width() - getScrollBarWidth(); } } else { // if there is none if($(window).width() > 768) { - controlsWidth = $('#content').width() - $('#app-navigation').width(); + controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width(); } else { controlsWidth = $('#content').width(); } |