diff options
author | zotlabs <mike@macgirvin.com> | 2017-10-09 15:15:02 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-10-09 15:15:02 -0700 |
commit | d636ff586d5f7e8d86a05a1e391b4501eb5f29f2 (patch) | |
tree | 729734bfc3c662b36c4a0a4e1735f5ce87eb2aba /view/tpl/notifications_widget.tpl | |
parent | 623dfa13845e34c85eae2a66c6aa855c3e059c38 (diff) | |
parent | cc1ffff7cdfe5881636b6d2de3fe16f0094b5d69 (diff) | |
download | volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.gz volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.bz2 volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/notifications_widget.tpl')
-rw-r--r-- | view/tpl/notifications_widget.tpl | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 83174b3a1..3323422d6 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -1,13 +1,6 @@ <style> - #notifications { - position: fixed; - top: 4.5rem; - width: 266px; - padding: 0 .5rem; - } - .notification-content { - max-height: 50vh; + max-height: 70vh; overflow: auto; } @@ -19,30 +12,25 @@ position: fixed; top: 0px; left: 0px; - display: block !important; + padding: 4.5rem .5rem 0 .5rem; background-color: white; width: 100%; max-width: 100%; height: 100vh; - z-index: 1020; - } - - .fs #notifications { - position: relative; - width: 100%; - top: 0px; + z-index: 1030; } </style> -<div id="nav-notifications-template" rel="template"> - <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"> - <img class="menu-img-3" data-src="{1}"> - <span class="contactname">{2}</span> - <span class="dropdown-sub-text">{3}<br>{4}</span> - </a> -</div> + <div id="notifications" class="navbar-nav" data-children=".nav-item"> + <div id="nav-notifications-template" rel="template"> + <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"> + <img class="menu-img-3" data-src="{1}"> + <span class="contactname">{2}</span> + <span class="dropdown-sub-text">{3}<br>{4}</span> + </a> + </div> {{foreach $notifications as $notification}} <div class="collapse {{$notification.type}}-button"> <a class="list-group-item" href="#nav-{{$notification.type}}-menu" title="{{$notification.title}}" data-toggle="collapse" data-parent="#notifications" rel="#nav-{{$notification.type}}-menu"> |