diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rw-r--r-- | view/php/default.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 18 | ||||
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 8 |
5 files changed, 12 insertions, 23 deletions
@@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.7.2' ); +define ( 'STD_VERSION', '3.7.3' ); define ( 'ZOT_REVISION', '6.0a' ); diff --git a/view/php/default.php b/view/php/default.php index 06cecc56f..70b8daecf 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -10,12 +10,12 @@ <header><?php if(x($page,'header')) echo $page['header']; ?></header> <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <main> - <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside> + <aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> <div id="pause"></div> </section> - <aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside> + <aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c905c92cb..70d196a02 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,26 +18,12 @@ $(document).ready(function() { $('#css3-calc').remove(); // Remove the test element if($(window).width() >= 992) { - $('#left_aside_wrapper').stick_in_parent({ - offset_top: parseInt($('aside').css('padding-top')), - parent: 'main', - spacer: '#left_aside_spacer' - }); - } - - if($(window).width() >= 992) { - $('#right_aside_wrapper').stick_in_parent({ + $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), - parent: 'main', - spacer: '#right_aside_spacer' + parent: 'main' }); } - - $('#notifications_wrapper.fs #notifications').stick_in_parent({ - parent: '#notifications_wrapper' - }); - $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 2de3c74be..7972b8e81 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -19,7 +19,6 @@ if(hide_cover) { hideCover(); - coverSlid = true; } if($(window).scrollTop() < $('#cover-photo').height()) { @@ -36,7 +35,7 @@ }); $(window).scroll(function () { - if($(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) { + if($(window).width() > 755 && $(window).scrollTop() > ($('#cover-photo').height() - 1)) { $('body').css('cursor', ''); $('.navbar').addClass('fixed-top'); $('main').css('margin-top', ''); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 068441997..99a0191b2 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -5,10 +5,14 @@ $(document).ready(function() { notifications_parent = $('#notifications_wrapper')[0].parentElement.id; $('.notifications-btn').click(function() { - if($('#notifications_wrapper').hasClass('fs')) + if($('#notifications_wrapper').hasClass('fs')) { $('#notifications_wrapper').prependTo('#' + notifications_parent); - else + $('body').css('overflow', 'visible'); + } + else { $('#notifications_wrapper').prependTo('section'); + $('body').css('overflow', 'hidden'); + } $('#notifications_wrapper').toggleClass('fs'); if($('#navbar-collapse-2').hasClass('show')){ |