mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix app-content scrollbar when app-sidebar is open

This commit is contained in:
Vincent Petry 2015-08-06 11:45:12 +02:00 committed by Arthur Schiwon
parent eb323fe8de
commit ae27f90efe
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/css/apps.css
View File

@ -430,7 +430,7 @@
right: 0; right: 0;
left: auto; left: auto;
bottom: 0; bottom: 0;
width: 300px; width: 27%;
display: block; display: block;
background: #eee; background: #eee;
-webkit-transition: margin-right 300ms; -webkit-transition: margin-right 300ms;
@ -443,8 +443,8 @@
z-index: 500; z-index: 500;
} }
#app-sidebar ~ .with-app-sidebar { #app-content.with-app-sidebar {
width: 73%; margin-right: 27%;
} }
#app-sidebar.disappear { #app-sidebar.disappear {

6
core/css/mobile.css
View File

@ -103,11 +103,7 @@
z-index: 1000; z-index: 1000;
} }
#app-sidebar { #app-sidebar{
width: 250px;
}
#app-sidebar ~ .with-app-sidebar {
width: 100%; width: 100%;
} }

10
core/js/apps.js
View File

@ -25,9 +25,8 @@
*/ */
exports.Apps.showAppSidebar = function() { exports.Apps.showAppSidebar = function() {
var $appSidebar = $('#app-sidebar'); var $appSidebar = $('#app-sidebar');
$appSidebar $appSidebar.removeClass('disappear')
.removeClass('disappear') $('#app-content').addClass('with-app-sidebar');
.find('~').addClass('with-app-sidebar');
}; };
@ -37,9 +36,8 @@
*/ */
exports.Apps.hideAppSidebar = function() { exports.Apps.hideAppSidebar = function() {
var $appSidebar = $('#app-sidebar'); var $appSidebar = $('#app-sidebar');
$appSidebar $appSidebar.addClass('disappear');
.addClass('disappear') $('#app-content').removeClass('with-app-sidebar');
.find('~ .with-app-sidebar').removeClass('with-app-sidebar');
}; };
/** /**

4
core/js/js.js
View File

@ -1366,13 +1366,13 @@ function initCore() {
// if there is a scrollbar … // if there is a scrollbar …
if($('#app-content').get(0).scrollHeight > $('#app-content').height()) { if($('#app-content').get(0).scrollHeight > $('#app-content').height()) {
if($(window).width() > 768) { if($(window).width() > 768) {
controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth(); controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width() - getScrollBarWidth();
} else { } else {
controlsWidth = $('#content').width() - getScrollBarWidth(); controlsWidth = $('#content').width() - getScrollBarWidth();
} }
} else { // if there is none } else { // if there is none
if($(window).width() > 768) { if($(window).width() > 768) {
controlsWidth = $('#content').width() - $('#app-navigation').width(); controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width();
} else { } else {
controlsWidth = $('#content').width(); controlsWidth = $('#content').width();
} }