diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
| commit | fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch) | |
| tree | 41fec09f527a9346e043b8099b458a97d81b03ed /view/theme/redbasic/js | |
| parent | 32de123db0ac526795a237ff46885fe8a332cbc0 (diff) | |
| parent | 06b3ad1071c755757555baf941e2c0f446f97b21 (diff) | |
| download | volse-hubzilla-3.8.tar.gz volse-hubzilla-3.8.tar.bz2 volse-hubzilla-3.8.zip | |
Merge branch '3.8RC'3.8
Diffstat (limited to 'view/theme/redbasic/js')
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c905c92cb..688e92148 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,26 +18,13 @@ $(document).ready(function() { $('#css3-calc').remove(); // Remove the test element if($(window).width() >= 992) { - $('#left_aside_wrapper').stick_in_parent({ + $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), parent: 'main', - spacer: '#left_aside_spacer' + spacer: '.aside_spacer' }); } - if($(window).width() >= 992) { - $('#right_aside_wrapper').stick_in_parent({ - offset_top: parseInt($('aside').css('padding-top')), - parent: 'main', - spacer: '#right_aside_spacer' - }); - } - - - $('#notifications_wrapper.fs #notifications').stick_in_parent({ - parent: '#notifications_wrapper' - }); - $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { @@ -56,7 +43,7 @@ $(document).ready(function() { }); - var right_aside_height = $('#rightt_aside_wrapper').height(); + var right_aside_height = $('#right_aside_wrapper').height(); $('#right_aside_wrapper').on('click', function() { if(right_aside_height != $('#right_aside_wrapper').height()) { |