diff options
| -rw-r--r-- | view/php/default.php | 4 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/view/php/default.php b/view/php/default.php index 70b8daecf..60f3f6a6f 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_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside> + <aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></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_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></aside> + <aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index b37ef40da..9b3d7487e 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -7,11 +7,14 @@ $('.notifications-btn').click(function() { if($('#notifications_wrapper').hasClass('fs')) { $('#notifications_wrapper').prependTo('#' + notifications_parent); - $('body').css('overflow', 'auto'); + //undo scrollbar remove + $('section').css('height', ''); } else { $('#notifications_wrapper').prependTo('section'); - $('body').css('overflow', 'hidden'); + //remove superfluous scrollbar + //setting overflow to hidden here has issues with some browsers + $('section').css('height', '100vh'); } $('#notifications_wrapper').toggleClass('fs'); |