wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-12 09:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adjust unread counter position based on length"

Browse source
This commit is contained in:
jenkins-bot 2016-12-21 10:29:00 +00:00 committed by Gerrit Code Review
parent 146ec9e5ec 01a1924187
commit f8fc22bada
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Hooks.php
View file

@ -937,6 +937,10 @@ class EchoHooks {
$msgLinkClasses[] = 'mw-echo-notifications-badge-all-read';
}
if ( $msgCount > MWEchoNotifUser::MAX_BADGE_COUNT ) {
$msgLinkClasses[] = 'mw-echo-notifications-badge-long-label';
}
if (
$alertCount != 0 && // no unread notifications
$alertNotificationTimestamp !== false && // should already always be false if count === 0
@ -948,6 +952,10 @@ class EchoHooks {
$alertLinkClasses[] = 'mw-echo-notifications-badge-all-read';
}
if ( $msgCount > MWEchoNotifUser::MAX_BADGE_COUNT ) {
$alertLinkClasses[] = 'mw-echo-notifications-badge-long-label';
}
$alertLink = [
'href' => $url,
'text' => $alertText,

6
modules/nojs/mw.echo.badge.less
View file

@ -58,6 +58,12 @@
color: #fff;
}
&.mw-echo-notifications-badge-long-label {
&:after {
left: 35%;
}
}
&.mw-echo-notifications-badge-all-read {
opacity: 0.625;

1
modules/ui/mw.echo.ui.BadgeLinkWidget.js
View file

@ -61,6 +61,7 @@
this.$element
.toggleClass( 'mw-echo-notifications-badge-all-read', !numItems )
.toggleClass( 'mw-echo-notifications-badge-long-label', label.length > 2 )
.attr( 'data-counter-num', numItems )
.attr( 'data-counter-text', label );
};