From d6b718584e8aff74a0e76f77d2c1c5689f78cc78 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 26 Jun 2018 16:47:16 +0200 Subject: Sidebar fix Fix sidebar and scrollbar on content Sidebar fixes, and sidebar-width + header-height variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/js/apps.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'core/js') diff --git a/core/js/apps.js b/core/js/apps.js index 8aebbbd418c..b40883e88cf 100644 --- a/core/js/apps.js +++ b/core/js/apps.js @@ -27,9 +27,8 @@ */ exports.Apps.showAppSidebar = function($el) { var $appSidebar = $el || $('#app-sidebar'); - $appSidebar.removeClass('disappear') - .show('slide', { direction: 'right' }, 200); - $('#app-content').addClass('with-app-sidebar', 200).trigger(new $.Event('appresized')); + $appSidebar.removeClass('disappear'); + $('#content').addClass('with-app-sidebar').trigger(new $.Event('appresized')); }; /** @@ -40,11 +39,8 @@ */ exports.Apps.hideAppSidebar = function($el) { var $appSidebar = $el || $('#app-sidebar'); - $appSidebar.hide('slide', { direction: 'right' }, 100, - function() { - $appSidebar.addClass('disappear'); - }); - $('#app-content').removeClass('with-app-sidebar', 100).trigger(new $.Event('appresized')); + $appSidebar.addClass('disappear'); + $('#content').removeClass('with-app-sidebar').trigger(new $.Event('appresized')); }; /** -- cgit v1.2.3