harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some issues with latest notification improvements

Browse Source
This commit is contained in:
Mario Vavti 2018-09-09 19:44:27 +02:00
parent 9607bb29fd
commit 677ad71b96
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/php/default.php
View File

@ -10,12 +10,12 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <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> <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main> <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']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
<div id="pause"></div> <div id="pause"></div>
</section> </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> </main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>

7
view/tpl/notifications_widget.tpl
View File

@ -7,11 +7,14 @@
$('.notifications-btn').click(function() { $('.notifications-btn').click(function() {
if($('#notifications_wrapper').hasClass('fs')) { if($('#notifications_wrapper').hasClass('fs')) {
$('#notifications_wrapper').prependTo('#' + notifications_parent); $('#notifications_wrapper').prependTo('#' + notifications_parent);
$('body').css('overflow', 'auto'); //undo scrollbar remove
$('section').css('height', '');
} }
else { else {
$('#notifications_wrapper').prependTo('section'); $('#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'); $('#notifications_wrapper').toggleClass('fs');