diff options
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index 8ff54e9cd..ea8d1a3ab 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -987,7 +987,7 @@ function notify_popup_loader(notifyType) { html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); $("#nav-" + notifyType + "-menu").append(html); }); - $(".dropdown-menu img[data-src], .dropdown-item img[data-src]").each(function(i, el){ + $(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){ // Replace data-src attribute with src attribute for every image $(el).attr('src', $(el).data("src")); $(el).removeAttr("data-src"); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2e8d71954..8b4a6ac82 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -787,18 +787,21 @@ div.jGrowl div.jGrowl-notification { .contactname { font-weight: bold; + color: $font_colour; display: block; overflow: hidden; text-overflow: ellipsis; } .dropdown-notification, +.notification, .member-item { line-height: 1.1em; font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; display: block; + white-space: nowrap; } #acl-search::-webkit-input-placeholder { diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index b87f48254..73cf24071 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -29,7 +29,7 @@ <div id="notifications_wrapper"> <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}"> + <a class="list-group-item clearfix 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> @@ -43,10 +43,10 @@ </a> <div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}"> {{if $notification.viewall}} - <a class="dropdown-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a> + <a class="list-group-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a> {{/if}} {{if $notification.markall}} - <a class="dropdown-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a> + <a class="list-group-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a> {{/if}} {{$loading}} </div> |