diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-15 12:41:03 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-15 12:41:03 -0800 |
| commit | cf4588f16fbe6dc55eabdb590480bc88d560dad3 (patch) | |
| tree | c056ad6dd6a173d342b6b86252e086e7d68271da /view | |
| parent | d43542dd7a64136626550ba0569b1939b84b8146 (diff) | |
| parent | 601f1eb624fce19a1da966e0e102b208a6ae7b74 (diff) | |
| download | volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.tar.gz volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.tar.bz2 volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/widgets.css | 28 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 35 |
2 files changed, 32 insertions, 31 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index cea3a3820..5b1273e25 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -168,3 +168,31 @@ a.wikilist { .active .conv-participants { color: #fff; } + +/* notifications */ + +.notification-content { + max-height: 70vh; + overflow: auto; +} + +.notification-content.collapsing { + overflow: hidden; +} + +.fs { + position: fixed; + top: 0px; + left: 0px; + padding: 4.5rem .5rem 1rem .5rem; + background-color: white; + width: 100%; + max-width: 100%; + height: 100%; + z-index: 1029; + overflow: auto; +} + +#notifications { + margin-bottom: 1rem; +} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 29892ba79..3ef7bff7d 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -1,32 +1,3 @@ -<style> - .notification-content { - max-height: 70vh; - overflow: auto; - } - - .notification-content.collapsing { - overflow: hidden; - } - - .fs { - position: fixed; - top: 0px; - left: 0px; - padding: 4.5rem .5rem 1rem .5rem; - background-color: white; - width: 100%; - max-width: 100%; - height: 100%; - z-index: 1029; - overflow: auto; - } - - #notifications { - margin-bottom: 1rem; - } -</style> - -{{if $module == 'display'}} <script> var notifications_parent; $(document).ready(function() { @@ -44,6 +15,7 @@ }); }); + {{if $module == 'display'}} $(document).on('click', '.notification', function(e) { var b64mid = $(this).data('b64mid'); var path = $(this)[0].pathname.substr(1,7); @@ -60,11 +32,12 @@ liveUpdate(); if($('#notifications_wrapper').hasClass('fs')) - $('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); //var notifications_parent is defined in redbasic.js + $('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs'); } }); + {{/if}} </script> -{{/if}} + {{if $notifications}} <div id="notifications_wrapper"> |