diff options
| author | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-09-10 22:11:26 -0700 |
| commit | adc164b825c3b9e322921f2da9d1baf178b04cd3 (patch) | |
| tree | fa5e805e53e7661ad936873e1a66017ad9dcd6a9 /view/tpl/notifications_widget.tpl | |
| parent | be3b6304742a6c39d73674b1f7422c029e7cd804 (diff) | |
| parent | c6abe87ec2e08fc38ff9c505ac2000d52d45c228 (diff) | |
| download | volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.gz volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.tar.bz2 volse-hubzilla-adc164b825c3b9e322921f2da9d1baf178b04cd3.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'view/tpl/notifications_widget.tpl')
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 068441997..9b3d7487e 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -5,10 +5,17 @@ $(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 + //undo scrollbar remove + $('section').css('height', ''); + } + else { $('#notifications_wrapper').prependTo('section'); + //remove superfluous scrollbar + //setting overflow to hidden here has issues with some browsers + $('section').css('height', '100vh'); + } $('#notifications_wrapper').toggleClass('fs'); if($('#navbar-collapse-2').hasClass('show')){ |