diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-08 09:39:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-08 09:39:46 +0100 |
| commit | bc2b948f1f6e62b1c277a4042200bb6678956f3f (patch) | |
| tree | 8586c30e495607eee23f16c0aad40974f0711275 /view/theme/redbasic/js/redbasic.js | |
| parent | 23e3e2c50499fab52769929a448e73012fd915af (diff) | |
| parent | ff9442474d07cce24c8f66db39ec34471c3874a2 (diff) | |
| download | volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.gz volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.tar.bz2 volse-hubzilla-bc2b948f1f6e62b1c277a4042200bb6678956f3f.zip | |
Merge branch 2.2RC2.2
Diffstat (limited to 'view/theme/redbasic/js/redbasic.js')
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3ff0c43ae..81a95c68b 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -53,8 +53,8 @@ $(document).ready(function() { }); $('.usermenu-head').click(function() { - if($('#navbar-collapse-1').hasClass('in')){ - $('#navbar-collapse-1').removeClass('in'); + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); } }); @@ -99,11 +99,13 @@ function makeFullScreen(full) { function toggleAside() { $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); if($('main').hasClass('region_1-on')){ + $('html, body').css('overflow-x', ''); $('main').removeClass('region_1-on') $('#overlay').remove(); $('#left_aside_wrapper').trigger("sticky_kit:detach"); } else { + $('html, body').css('overflow-x', 'hidden'); $('main').addClass('region_1-on') $('<div id="overlay"></div>').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ |