Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330382 )
Change subject: Notifications icon simplified to circle from bell ...................................................................... Notifications icon simplified to circle from bell The notifications icon is now a circle with a number. Change-Id: Ia565a99219dec858d93aa49809df07f910739646 --- M extension.json M includes/skins/SkinMinerva.php M resources/skins.minerva.base.styles/ui.less 3 files changed, 17 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/82/330382/1 diff --git a/extension.json b/extension.json index de820c8..8412cf5 100644 --- a/extension.json +++ b/extension.json @@ -168,7 +168,6 @@ "class": "ResourceLoaderImageModule", "selector": ".mw-ui-icon-{name}:before", "images": { - "notifications": "resources/skins.minerva.icons.images/bell.svg", "mainmenu": "resources/skins.minerva.icons.images/hamburger.svg", "edit": "resources/skins.minerva.icons.images/editLocked.svg", "edit-enabled": "resources/skins.minerva.icons.images/edit.svg", diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 9ae5aba..720cac1 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -342,24 +342,15 @@ * @return string html relating to button */ protected function createSecondaryButton( $title, $url, $spanLabel, $spanClass ) { - return Html::openElement( 'a', [ + return Html::element( 'a', + [ 'title' => $title, 'href' => $url, - 'class' => MobileUI::iconClass( 'notifications', 'element', - 'user-button main-header-button icon-32px' ), + 'class' => 'notification-indicator user-button main-header-button ' . $spanClass, 'id' => 'secondary-button', - ] ) . - Html::element( - 'span', - [ 'class' => 'label' ], - $title - ) . - Html::closeElement( 'a' ) . - Html::element( - 'span', - [ 'class' => $spanClass ], - $spanLabel - ); + ], + $spanLabel + ); } /** diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less index e85cff5..9f20f90 100644 --- a/resources/skins.minerva.base.styles/ui.less +++ b/resources/skins.minerva.base.styles/ui.less @@ -334,39 +334,26 @@ } } -.notification-count { - text-indent: 0; - display: inline-block; - font-weight: bold; - border-radius: @borderRadius; - height: 1.2em; - line-height: 1.2em; - min-width: 1em; - margin: 0.6em 0.6em 0 0; - padding: 0 0.1em; - text-align: center; - position: absolute; - right: 0; - top: -0.1em; +.notification-indicator { + border: solid 1.5px @colorGray5; + width: 24px; + height: 24px; + display: block; + border-radius: 12px; color: @colorGray7; - background: #d2d2d2; + background: none; + text-align: center; + font-size: 0.8em; + line-height: 24px; &.notification-unseen { color: #fff; + border-color: #c91f2c; background: #c91f2c; } &.zero { display: none; - } - - // FIXME: There must be a better way of doing this - &.max { - right: 0.2em; - width: 2em; - height: 2em; - line-height: 2em; - font-size: 0.7em; } } -- To view, visit https://gerrit.wikimedia.org/r/330382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia565a99219dec858d93aa49809df07f910739646 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: branding Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits