diff options
| author | Mario <mario@mariovavti.com> | 2019-12-12 14:51:10 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-12-12 14:51:10 +0000 |
| commit | 544ef3bc588d4180d7ecad15bdacd43813a7c5c5 (patch) | |
| tree | 62372d0af859287235f62f20d0cf55b5b5b1ace3 /view | |
| parent | 124cc4396247c75c14280136cfaa95415860ad4c (diff) | |
| download | volse-hubzilla-544ef3bc588d4180d7ecad15bdacd43813a7c5c5.tar.gz volse-hubzilla-544ef3bc588d4180d7ecad15bdacd43813a7c5c5.tar.bz2 volse-hubzilla-544ef3bc588d4180d7ecad15bdacd43813a7c5c5.zip | |
update composer libs and minor notifications display fixes
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index d2daf0b8a..7382bec1a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -93,3 +93,7 @@ small, .small { font-size: 0.75rem; } + +.notification-link.collapsed { + border-top: 0 !important; +} diff --git a/view/js/main.js b/view/js/main.js index 66a0bda2f..da1894f88 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1876,10 +1876,12 @@ function sse_setNotificationsStatus() { if(any_available) { $('.notifications-btn').css('opacity', 1); $('#no_notifications').hide(); + $('#notifications').show(); } else { $('.notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('show'); $('#no_notifications').show(); + $('#notifications').hide(); } } diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 5e96c2767..8e22da6c5 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -151,9 +151,9 @@ <i class="fa fa-{11} text-muted"></i> </a> </div> - <div id="notifications" class="navbar-nav"> + <div id="notifications" class="border rounded border-bottom-0 list-group list-group-flush navbar-nav collapse"> {{foreach $notifications as $notification}} - <div class="collapse {{$notification.type}}-button"> + <div class="list-group collapse {{$notification.type}}-button"> <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}"> <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}} <span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span> @@ -161,7 +161,7 @@ <div class="spinner s"></div> </div> </a> - <div id="nav-{{$notification.type}}-sub" class="collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> + <div id="nav-{{$notification.type}}-sub" class="list-group border-bottom collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} <a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} @@ -186,8 +186,8 @@ </div> {{/if}} {{/if}} - <div id="nav-{{$notification.type}}-menu"></div> - <div id="nav-{{$notification.type}}-loading" style="display: none;"> + <div id="nav-{{$notification.type}}-menu" class="list-group"></div> + <div id="nav-{{$notification.type}}-loading" class="list-group-item border-0" style="display: none;"> {{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> |