diff --git a/includes/menu/User/UserMenuDirector.php b/includes/menu/User/UserMenuDirector.php
index 2192993..6e38173 100644
--- a/includes/menu/User/UserMenuDirector.php
+++ b/includes/menu/User/UserMenuDirector.php
@@ -68,7 +68,7 @@ final class UserMenuDirector {
'checkboxID' => 'minerva-user-menu-checkbox',
'toggleID' => 'minerva-user-menu-toggle', // See minerva.mustache too.
'toggleClass' => MinervaUI::iconClass(
- 'page-actions-overflow', 'element', 'wikimedia-ui-' . 'userAvatar' . '-base20'
+ 'page-actions-overflow', 'element', 'wikimedia-ui-' . 'userAvatarOutline' . '-base20'
),
'listClass' => 'minerva-user-menu-list toggle-list__list--drop-down', // See ToggleList/*.less.
'text' => $this->localizer->msg( 'minerva-user-menu-button' )->escaped(),
diff --git a/includes/skins/MinervaTemplate.php b/includes/skins/MinervaTemplate.php
index f6e6090..af6feaa 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -254,7 +254,9 @@ class MinervaTemplate extends BaseTemplate {
// which is problematic in Opera Mini (see T140490)
'searchButton' => Html::rawElement( 'button', [
'id' => 'searchIcon',
- 'class' => MinervaUI::iconClass( 'magnifying-glass', 'element', 'skin-minerva-search-trigger' ),
+ 'class' => MinervaUI::iconClass(
+ 'search-base20', 'element', 'skin-minerva-search-trigger', 'wikimedia'
+ )
], wfMessage( 'searchbutton' ) ),
'userNotificationsData' => $data['userNotificationsData'],
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 5172d86..922ce78 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -399,7 +399,8 @@ class SkinMinerva extends SkinTemplate {
[ 'returnto' => $currentTitle->getPrefixedText() ] );
$tpl->set( 'userNotificationsData', [
- 'notificationIconClass' => MinervaUI::iconClass( 'notifications' ),
+ 'notificationIconClass' => MinervaUI::iconClass( 'bellOutline-base20',
+ 'element', '', 'wikimedia' ),
'title' => $notificationsMsg,
'url' => $url,
'notificationCountRaw' => $count,
@@ -923,6 +924,7 @@ class SkinMinerva extends SkinTemplate {
'mediawiki.hlist',
'mediawiki.ui.icon',
'mediawiki.ui.button',
+ 'skins.minerva.icons.wikimedia',
'skins.minerva.icons.images',
];
if ( $title->isMainPage() ) {
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 655ad24..349b6c3 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -14,7 +14,7 @@
-
diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less
index 8405b01..10d5ba0 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -145,7 +145,7 @@ main {
/* Search */
.search-box .search {
@border-width-base: 1px;
- @searchIconSize: 20px;
+ @searchIconSize: 18px;
@searchIconGutter: 6px;
@padding-vertical-search: 8px - @border-width-base;
@padding-start-search-icon: @searchIconSize + ( 2 * @searchIconGutter ) - @border-width-base;
diff --git a/resources/skins.minerva.icons.loggedin/bell.svg b/resources/skins.minerva.icons.loggedin/bell.svg
deleted file mode 100644
index df4816f..0000000
--- a/resources/skins.minerva.icons.loggedin/bell.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/resources/skins.minerva.scripts/NotificationBadge.js b/resources/skins.minerva.scripts/NotificationBadge.js
index 3ac08f1..f04b9ab 100644
--- a/resources/skins.minerva.scripts/NotificationBadge.js
+++ b/resources/skins.minerva.scripts/NotificationBadge.js
@@ -6,8 +6,8 @@
util = mobile.util,
Icon = mobile.Icon,
notificationIcon = new Icon( {
- name: 'notifications',
- glyphPrefix: 'minerva'
+ name: 'bellOutline-base20',
+ glyphPrefix: 'wikimedia'
} );
/**
diff --git a/skin.json b/skin.json
index e28d309..7af061f 100644
--- a/skin.json
+++ b/skin.json
@@ -244,12 +244,16 @@
}
},
"skins.minerva.icons.loggedin": {
- "class": "ResourceLoaderImageModule",
- "selector": ".mw-ui-icon-minerva-{name}:before",
+ "class": "ResourceLoaderOOUIIconPackModule",
+ "targets": [
+ "mobile",
+ "desktop"
+ ],
"useDataURI": false,
- "images": {
- "notifications": "resources/skins.minerva.icons.loggedin/bell.svg"
- }
+ "defaultColor": "#54595d",
+ "variants": [],
+ "selectorWithoutVariant": ".mw-ui-icon-wikimedia-{name}-base20:before",
+ "icons": [ "bellOutline" ]
},
"skins.minerva.amc.styles": {
"targets": [
@@ -270,7 +274,14 @@
"defaultColor": "#54595d",
"class": "ResourceLoaderOOUIIconPackModule",
"icons": [ "articleRedirect", "info", "link", "listBullet",
- "logoWikidata", "logoWikimedia", "quotes", "upload", "userAvatar", "userTalk" ]
+ "logoWikidata", "logoWikimedia", "quotes", "upload", "userAvatarOutline", "userTalk" ]
+ },
+ "skins.minerva.icons.wikimedia": {
+ "selectorWithoutVariant": ".mw-ui-icon-wikimedia-{name}-base20:before, .mw-ui-background-icon-{name}",
+ "useDataURI": false,
+ "defaultColor": "#54595d",
+ "class": "ResourceLoaderOOUIIconPackModule",
+ "icons": [ "search" ]
},
"skins.minerva.icons.images": {
"class": "ResourceLoaderImageModule",
@@ -444,6 +455,7 @@
"desktop"
],
"dependencies": [
+ "skins.minerva.icons.wikimedia",
"mediawiki.ui.anchor",
"wikimedia.ui",
"skins.minerva.mainMenu.icons",
diff --git a/tests/phpunit/skins/SkinMinervaTest.php b/tests/phpunit/skins/SkinMinervaTest.php
index 58d5b23..1f29955 100644
--- a/tests/phpunit/skins/SkinMinervaTest.php
+++ b/tests/phpunit/skins/SkinMinervaTest.php
@@ -267,7 +267,8 @@ class SkinMinervaTest extends MediaWikiTestCase {
$hasUnseen
) {
return [
- 'notificationIconClass' => MinervaUI::iconClass( 'notifications' ),
+ 'notificationIconClass' =>
+ MinervaUI::iconClass( 'bellOutline-base20', 'element', '', 'wikimedia' ),
'title' => $notificationsMsg,
'url' => SpecialPage::getTitleFor( $notificationsTitle )
->getLocalURL(