From c259a9b3871d378f804222409b73f659e9dabdfb Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 5 Nov 2016 16:15:50 -0700 Subject: [PATCH 1/8] [ticket/14855] Update notification and PM alert bubbles PHPBB3-14855 --- phpBB/styles/prosilver/template/navbar_header.html | 14 +++++++------- phpBB/styles/prosilver/theme/colours.css | 5 +++++ phpBB/styles/prosilver/theme/common.css | 7 +++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index e948e2e0f6..3e5720ad65 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -18,7 +18,7 @@
  • {L_SEARCH_NEW}
    • - +
  • {L_SEARCH_UNREAD}
  • {L_SEARCH_UNANSWERED}
    • @@ -55,14 +55,14 @@
    @@ -72,12 +72,12 @@
  • - {L_PRIVATE_MESSAGES} [{PRIVATE_MESSAGE_COUNT}] + {L_PRIVATE_MESSAGES} {PRIVATE_MESSAGE_COUNT}
  • - {L_NOTIFICATIONS} [{NOTIFICATIONS_COUNT}] + {L_NOTIFICATIONS} {NOTIFICATIONS_COUNT}
    • diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 29cf641df2..5de35d4c63 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1161,3 +1161,8 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist li.notification-reported strong, li.notification-disapproved strong { color: #D31141; } + +.notification-alert { + background-color: #D31141; + color: #ffffff; +} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 5dd5ecdb28..cb9e3c04e2 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1251,6 +1251,13 @@ ul.linklist:after, margin-left: 58px; } +.notification-alert { + border-radius: 50px; + font-size: 0.9em; + opacity: 0.8; + padding: 4px 7px; +} + /* Navbar specific list items ----------------------------------------*/ From 87209fdd0697f13f0d28e70ffd31ce7d3c9c2104 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 5 Nov 2016 16:29:13 -0700 Subject: [PATCH 2/8] [ticket/14855] Fix responsive alert bubble CSS PHPBB3-14855 --- phpBB/styles/prosilver/theme/common.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index cb9e3c04e2..d59efc0bb5 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1251,7 +1251,8 @@ ul.linklist:after, margin-left: 58px; } -.notification-alert { +.notification-alert, +.compact .notification-alert { border-radius: 50px; font-size: 0.9em; opacity: 0.8; @@ -1288,10 +1289,6 @@ ul.linklist:after, display: none; } -.compact .icon-notification > a > strong, .compact .icon-pm > a > strong { - padding-left: 2px; -} - .dropdown-page-jump .dropdown { top: 20px; } From af2bf4ef3662fbc7e84d36e9f638317d3d28123d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 5 Nov 2016 19:41:08 -0700 Subject: [PATCH 3/8] [ticket/14855] Update notification functional test PHPBB3-14855 --- tests/functional/notification_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php index ec03f7a6a4..d4c61cc062 100644 --- a/tests/functional/notification_test.php +++ b/tests/functional/notification_test.php @@ -82,6 +82,6 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case // Get form token $link = $crawler->selectLink($this->lang('NOTIFICATIONS_MARK_ALL_READ'))->link()->getUri(); $crawler = self::request('GET', substr($link, strpos($link, 'ucp.'))); - $this->assertEquals(0, $crawler->filter('#notification_list_button strong')->text()); + $this->assertCount(0, $crawler->filter('#notification_list_button strong')); } } From 0e114f91f46c626ee595a0aa2ee3bf41078e9f8d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 6 Nov 2016 10:00:50 -0800 Subject: [PATCH 4/8] [ticket/14855] Remove notification bubble on mark all read PHPBB3-14855 --- phpBB/styles/prosilver/template/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index e3780f024a..2e49b5de26 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -134,7 +134,7 @@ phpbb.markNotifications = function($popup, unreadCount) { $('strong', '#notification_list_button').html(unreadCount); // Remove the Mark all read link if there are no unread notifications. if (!unreadCount) { - $('#mark_all_notifications').remove(); + $('#mark_all_notifications, #notification_list_button > strong').remove(); } // Update page title From 9b1e2e523c827b2af3bb5b6d8ccdf4338f8f4ffc Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 6 Nov 2016 16:12:39 -0800 Subject: [PATCH 5/8] [ticket/14855] Update the comments PHPBB3-14855 --- phpBB/styles/prosilver/template/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 2e49b5de26..311da92a95 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -132,7 +132,7 @@ phpbb.markNotifications = function($popup, unreadCount) { // Update the unread count. $('strong', '#notification_list_button').html(unreadCount); - // Remove the Mark all read link if there are no unread notifications. + // Remove the Mark all read link & notification count if there are no unread notifications. if (!unreadCount) { $('#mark_all_notifications, #notification_list_button > strong').remove(); } From 74285b430801db773b7b69536f6e74fbf88917ea Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 11 Nov 2016 09:28:35 -0800 Subject: [PATCH 6/8] [ticket/14855] Update CSS PHPBB3-14855 --- .../prosilver/template/navbar_header.html | 4 ++-- phpBB/styles/prosilver/theme/common.css | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 3e5720ad65..9179b659cd 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -72,12 +72,12 @@
  • - {L_PRIVATE_MESSAGES} {PRIVATE_MESSAGE_COUNT} + {L_PRIVATE_MESSAGES} {PRIVATE_MESSAGE_COUNT}
  • - {L_NOTIFICATIONS} {NOTIFICATIONS_COUNT} + {L_NOTIFICATIONS} {NOTIFICATIONS_COUNT}
    • diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index d59efc0bb5..03d59ed6b8 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1251,12 +1251,21 @@ ul.linklist:after, margin-left: 58px; } -.notification-alert, -.compact .notification-alert { - border-radius: 50px; - font-size: 0.9em; +.notification-alert { + border-radius: 10px; opacity: 0.8; - padding: 4px 7px; + min-width: 10px; + text-align: center; + white-space: nowrap; + font-size: 9px; + line-height: 1; + float: right; + display: inline-block; + margin-left: 3px; + vertical-align: baseline; + position: relative; + top: 3px; + padding: 4px 6px; } /* Navbar specific list items From 0fd04f2e6fb8e9c8f63e7a131cb2161581ae125e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 11 Nov 2016 16:38:46 -0800 Subject: [PATCH 7/8] [ticket/14855] CSS updates PHPBB3-14855 --- phpBB/styles/prosilver/template/navbar_header.html | 4 ++-- phpBB/styles/prosilver/theme/colours.css | 2 +- phpBB/styles/prosilver/theme/common.css | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 9179b659cd..e5f354a943 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -72,12 +72,12 @@
  • - {L_PRIVATE_MESSAGES} {PRIVATE_MESSAGE_COUNT} + {L_PRIVATE_MESSAGES} {PRIVATE_MESSAGE_COUNT}
  • - {L_NOTIFICATIONS} {NOTIFICATIONS_COUNT} + {L_NOTIFICATIONS} {NOTIFICATIONS_COUNT}
    • diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 5de35d4c63..9095e61369 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1162,7 +1162,7 @@ li.notification-reported strong, li.notification-disapproved strong { color: #D31141; } -.notification-alert { +.badge { background-color: #D31141; color: #ffffff; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 03d59ed6b8..c01625c394 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1251,10 +1251,9 @@ ul.linklist:after, margin-left: 58px; } -.notification-alert { +.badge { border-radius: 10px; opacity: 0.8; - min-width: 10px; text-align: center; white-space: nowrap; font-size: 9px; From 55f74381874b7e6ec0ef1147913b6f44582c5f62 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 12 Nov 2016 09:32:57 -0800 Subject: [PATCH 8/8] [ticket/14855] Bump font size to 10px PHPBB3-14855 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index c01625c394..9c2f33f7a9 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1256,7 +1256,7 @@ ul.linklist:after, opacity: 0.8; text-align: center; white-space: nowrap; - font-size: 9px; + font-size: 10px; line-height: 1; float: right; display: inline-block;