diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:16:25 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-11 20:16:25 +0100 |
| commit | 0cf85c047e848a75df236c4617b449498627dccc (patch) | |
| tree | 03fd4b002033970e5bf4d2d36be440d042df69a3 /phpBB | |
| parent | 27df2278ef7fbc3ce28d6926b1a57f2fd232e2db (diff) | |
| parent | e40afd8cd160a5b13cba08fa1725c50a27d0f022 (diff) | |
| download | forums-0cf85c047e848a75df236c4617b449498627dccc.tar forums-0cf85c047e848a75df236c4617b449498627dccc.tar.gz forums-0cf85c047e848a75df236c4617b449498627dccc.tar.bz2 forums-0cf85c047e848a75df236c4617b449498627dccc.tar.xz forums-0cf85c047e848a75df236c4617b449498627dccc.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
[ticket/14855] Update notification and PM alert bubbles
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_header.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 3888d26785..1bb3aabb9b 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -132,9 +132,10 @@ phpbb.markNotifications = function($popup, unreadCount) { // Update the unread count. $('strong', '#notification_list_button').html(unreadCount); - // Remove the Mark all read link & notification count if there are no unread notifications. + // Remove the Mark all read link and hide notification count if there are no unread notifications. if (!unreadCount) { - $('#mark_all_notifications, #notification_list_button > strong').remove(); + $('#mark_all_notifications').remove(); + $('#notification_list_button > strong').addClass('hidden'); } // Update page title diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index c300b9acda..b8080a6be3 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -145,14 +145,14 @@ <!-- IF S_DISPLAY_PM --> <li class="rightside" data-skip-responsive="true"> <a href="{U_PRIVATEMSGS}" role="menuitem"> - <i class="icon fa-inbox fa-fw" aria-hidden="true"></i><span>{L_PRIVATE_MESSAGES} <!-- IF PRIVATE_MESSAGE_COUNT --><strong class="badge">{PRIVATE_MESSAGE_COUNT}</strong><!-- ENDIF --></span> + <i class="icon fa-inbox fa-fw" aria-hidden="true"></i><span>{L_PRIVATE_MESSAGES} </span><strong class="badge<!-- IF not PRIVATE_MESSAGE_COUNT --> hidden<!-- ENDIF -->">{PRIVATE_MESSAGE_COUNT}</strong> </a> </li> <!-- ENDIF --> <!-- IF S_NOTIFICATIONS_DISPLAY --> <li class="dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true"> <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> - <i class="icon fa-bell fa-fw" aria-hidden="true"></i><span>{L_NOTIFICATIONS} <!-- IF NOTIFICATIONS_COUNT --><strong class="badge">{NOTIFICATIONS_COUNT}</strong><!-- ENDIF --></span> + <i class="icon fa-bell fa-fw" aria-hidden="true"></i><span>{L_NOTIFICATIONS} </span><strong class="badge<!-- IF not NOTIFICATIONS_COUNT --> hidden<!-- ENDIF -->">{NOTIFICATIONS_COUNT}</strong> </a> <!-- INCLUDE notification_dropdown.html --> </li> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index ee585e6abf..1a2c13a758 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1223,6 +1223,10 @@ ul.linklist:after, padding: 4px 6px; } +.badge.hidden { + display: none; +} + /* Navbar specific list items ----------------------------------------*/ |