Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403085 )
Change subject: Prefix icons in Minerva
......................................................................
Prefix icons in Minerva
Changes:
* MinervaUI will now prefix any icons with `minerva`
* Update definitions in skin.json, retaining selectors for cached
HTML for icons that are rendered via PHP.
Move skins.minerva.icons.images.variants into MobileFrontend?
* anonymous and user icons actually live in MobileFrontend. They
are not needed/used here so are removed
* In I9021c53c2c04bdd7ce395eed33d89986acbfea6d watch and watched
are moved to MobileFrontend so are removed here as they are not
used directly in this repo.
Depends-On: I9021c53c2c04bdd7ce395eed33d89986acbfea6d
Bug: T182162
Change-Id: I93264024f4915fc910c792b1905b89cdc6b8b546
---
M includes/MinervaUI.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/user_page_links.mustache
D resources/skins.minerva.icons.images.scripts/watch.svg
D resources/skins.minerva.icons.images.scripts/watched.svg
M resources/skins.minerva.scripts/DownloadIcon.js
M skin.json
8 files changed, 23 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/85/403085/1
diff --git a/includes/MinervaUI.php b/includes/MinervaUI.php
index d800514..416dc0f 100644
--- a/includes/MinervaUI.php
+++ b/includes/MinervaUI.php
@@ -22,7 +22,7 @@
$base = 'mw-ui-icon';
$modifiers = 'mw-ui-icon-' . $iconType;
if ( $iconName ) {
- $modifiers .= ' mw-ui-icon-' . $iconName;
+ $modifiers .= ' mw-ui-icon-minerva-' . $iconName;
}
return $base . ' ' . $modifiers . ' ' . $additionalClassNames;
}
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 7726d05..bf150d2 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -279,7 +279,7 @@
// which is problematic in Opera Mini (see T140490)
'searchButton' => Html::rawElement( 'button', [
'id' => 'searchIcon',
- 'class' => MinervaUI::iconClass(
'magnifying-glass', 'element' ),
+ 'class' => MinervaUI::iconClass(
'minerva-magnifying-glass', 'element' ),
], wfMessage( 'searchbutton' ) ),
'secondaryButtonData' => $data['secondaryButtonData'],
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b0fc312..1704247 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -460,7 +460,7 @@
->addComponent(
$this->msg(
'mobile-frontend-main-menu-contributions' )->escaped(),
SpecialPage::getTitleFor( 'Contributions',
$user->getName() )->getLocalUrl(),
- MinervaUI::iconClass( 'mf-contributions',
'before' ),
+ MinervaUI::iconClass( 'contributions', 'before'
),
[ 'data-event-name' => 'contributions' ]
);
}
@@ -498,7 +498,7 @@
'mobile-frontend-watchlist-purpose',
$watchlistQuery
),
- MinervaUI::iconClass( 'mf-watchlist', 'before'
),
+ MinervaUI::iconClass( 'watchlist', 'before' ),
[ 'data-event-name' => 'watchlist' ]
);
}
@@ -520,7 +520,7 @@
$this->msg(
'mobile-frontend-main-menu-settings' )->escaped(),
SpecialPage::getTitleFor(
'MobileOptions' )->
getLocalUrl( [ 'returnto' =>
$returnToTitle ] ),
- MinervaUI::iconClass( 'mf-settings',
'before' ),
+ MinervaUI::iconClass( 'settings',
'before' ),
[ 'data-event-name' => 'settings' ]
);
@@ -535,7 +535,7 @@
SpecialPage::getTitleFor(
'Preferences' ),
'prefsnologintext2'
),
- MinervaUI::iconClass( 'mf-settings',
'before' ),
+ MinervaUI::iconClass( 'settings',
'before' ),
[ 'data-event-name' => 'preferences' ]
);
}
@@ -621,7 +621,7 @@
->addComponent(
$this->msg( 'mobile-frontend-home-button'
)->escaped(),
Title::newMainPage()->getLocalUrl(),
- MinervaUI::iconClass( 'mf-home', 'before' ),
+ MinervaUI::iconClass( 'home', 'before' ),
[ 'data-event-name' => 'home' ]
);
@@ -630,7 +630,7 @@
->addComponent(
$this->msg( 'mobile-frontend-random-button'
)->escaped(),
SpecialPage::getTitleFor( 'Randompage'
)->getLocalUrl() . '#/random',
- MinervaUI::iconClass( 'mf-random', 'before' ),
+ MinervaUI::iconClass( 'random', 'before' ),
[
'id' => 'randomButton',
'data-event-name' => 'random',
@@ -647,7 +647,7 @@
->addComponent(
$this->msg(
'mobile-frontend-main-menu-nearby' )->escaped(),
SpecialPage::getTitleFor( 'Nearby'
)->getLocalURL(),
- MinervaUI::iconClass( 'mf-nearby',
'before', 'nearby' ),
+ MinervaUI::iconClass( 'nearby',
'before', 'nearby' ),
[ 'data-event-name' => 'nearby' ]
);
}
@@ -697,14 +697,14 @@
->addComponent(
$username,
Title::newFromText( $username, NS_USER
)->getLocalUrl(),
- MinervaUI::iconClass( 'mf-profile',
'before', 'truncated-text primary-action' ),
+ MinervaUI::iconClass( 'profile',
'before', 'truncated-text primary-action' ),
[ 'data-event-name' => 'profile' ]
)
->addComponent(
$this->msg(
'mobile-frontend-main-menu-logout' )->escaped(),
$url,
MinervaUI::iconClass(
- 'mf-logout', 'element',
'secondary-action truncated-text' ),
+ 'minerva-logout', 'element',
'secondary-action truncated-text' ),
[ 'data-event-name' => 'logout' ]
);
} else {
@@ -719,7 +719,7 @@
->addComponent(
$this->msg(
'mobile-frontend-main-menu-login' )->escaped(),
$url,
- MinervaUI::iconClass( 'mf-anonymous',
'before' ),
+ MinervaUI::iconClass( 'anonymous',
'before' ),
[ 'data-event-name' => 'login' ]
);
}
@@ -885,6 +885,7 @@
$pageUser = $this->getUserPageHelper()->getPageUser();
$talkPage = $pageUser->getTalkPage();
$data = [
+ 'userPageIconClass' => MinervaUI::iconClass(
'talk', 'before', 'talk' ),
'talkPageTitle' => $talkPage->getPrefixedURL(),
'talkPageLink' => $talkPage->getLocalUrl(),
'talkPageLinkTitle' => $this->msg(
@@ -945,7 +946,7 @@
'title' => $this->msg(
'mobile-frontend-main-menu-button-tooltip' ),
'href' => $url,
'class' => MinervaUI::iconClass( 'mainmenu',
'element', 'main-menu-button' ),
- 'id' => 'mw-mf-main-menu-button',
+ 'id' => 'mw-minerva-main-menu-button',
], $this->msg(
'mobile-frontend-main-menu-button-tooltip' ) )
);
}
diff --git a/includes/skins/user_page_links.mustache
b/includes/skins/user_page_links.mustache
index a5f5d5d..8440bc1 100644
--- a/includes/skins/user_page_links.mustache
+++ b/includes/skins/user_page_links.mustache
@@ -3,7 +3,7 @@
<a href="{{talkPageLink}}"
{{! data-title is used in talk overlay. Do not remove it }}
data-title="{{talkPageTitle}}"
- class="mw-ui-icon mw-ui-icon-before mw-ui-icon-talk
talk">{{talkPageLinkTitle}}</a>
+ class="{{userPageIconClass}}">{{talkPageLinkTitle}}</a>
</li>
<li>
<a
href="{{contributionsPageLink}}">{{contributionsPageTitle}}</a>
diff --git a/resources/skins.minerva.icons.images.scripts/watch.svg
b/resources/skins.minerva.icons.images.scripts/watch.svg
deleted file mode 100644
index 9a4a99d..0000000
--- a/resources/skins.minerva.icons.images.scripts/watch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="24" height="24" viewBox="0 0 24 24"><g id="Page-1" fill="none"
fill-rule="evenodd"><g id="watchstar" fill="#54595d"><path d="M8.91 9H1l6.007
5.86L5 23l7-4.319L19 23l-1.995-8.14L23 9h-7.909l-3.09-8-3.09 8zm.054
5.188L5.312 11h4.818L12 5.747 13.881 11h4.82l-3.653 3.2 1.099 4.956L12
16.516l-4.136 2.627 1.1-4.955z"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images.scripts/watched.svg
b/resources/skins.minerva.icons.images.scripts/watched.svg
deleted file mode 100644
index 958f1e5..0000000
--- a/resources/skins.minerva.icons.images.scripts/watched.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg";
width="24" height="24" viewBox="0 0 24 24"><path fill="#00af89" d="M8.91
9H1l6.007 5.86L5 23l7-4.319L19 23l-1.995-8.14L23 9h-7.909l-3.09-8z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.scripts/DownloadIcon.js
b/resources/skins.minerva.scripts/DownloadIcon.js
index bbaeda2..3c84f96 100644
--- a/resources/skins.minerva.scripts/DownloadIcon.js
+++ b/resources/skins.minerva.scripts/DownloadIcon.js
@@ -2,7 +2,7 @@
var msg = mw.msg,
MAX_PRINT_TIMEOUT = 3000,
- GLYPH = 'mf-download',
+ GLYPH = 'minerva-download',
Icon = M.require( 'mobile.startup/Icon' );
/**
diff --git a/skin.json b/skin.json
index c1758a7..15b0d45 100644
--- a/skin.json
+++ b/skin.json
@@ -134,7 +134,7 @@
},
"skins.minerva.icons.images": {
"class": "ResourceLoaderImageModule",
- "selector": ".mw-ui-icon-{name}:before",
+ "selector": ".mw-ui-icon-minerva-{name}:before,
.mw-ui-icon-{name}:before",
"images": {
"notifications":
"resources/skins.minerva.icons.images/bell.svg",
"mainmenu":
"resources/skins.minerva.icons.images/hamburger.svg",
@@ -145,8 +145,8 @@
}
},
"skins.minerva.icons.images.variants": {
- "selectorWithoutVariant": ".mw-ui-icon-{name}:before",
- "selectorWithVariant":
".mw-ui-icon-{name}-{variant}:before",
+ "selectorWithoutVariant":
".mw-ui-icon-minerva-{name}:before",
+ "selectorWithVariant":
".mw-ui-icon-minerva-{name}-{variant}:before",
"class": "ResourceLoaderImageModule",
"variants": {
"gray": {
@@ -165,14 +165,10 @@
},
"skins.minerva.icons.images.scripts": {
"class": "ResourceLoaderImageModule",
- "selector": ".mw-ui-icon-{name}:before",
+ "selector": ".mw-ui-icon-minerva-{name}:before",
"position": "bottom",
"images": {
- "mf-download":
"resources/skins.minerva.icons.images.scripts/download.svg",
- "watch":
"resources/skins.minerva.icons.images.scripts/watch.svg",
- "watched":
"resources/skins.minerva.icons.images.scripts/watched.svg",
- "user":
"resources/skins.minerva.icons.images.scripts/userNormal.svg",
- "anonymous":
"resources/skins.minerva.icons.images.scripts/userAnonymous.svg"
+ "download":
"resources/skins.minerva.icons.images.scripts/download.svg"
}
},
"skins.minerva.mainPage.styles": {
@@ -187,7 +183,7 @@
},
"skins.minerva.userpage.icons": {
"class": "ResourceLoaderImageModule",
- "selector": ".mw-ui-icon-{name}:before",
+ "selector": ".mw-ui-icon-minerva-{name}:before",
"images": {
"talk":
"resources/skins.minerva.userpage.icons/talk.svg",
"userpage":
"resources/skins.minerva.userpage.icons/userpage.svg"
@@ -204,7 +200,7 @@
},
"skins.minerva.mainMenu.icons": {
"class": "ResourceLoaderImageModule",
- "selector": ".mw-ui-icon-mf-{name}:before",
+ "selector": ".mw-ui-icon-minerva-{name}:before",
"images": {
"anonymous":
"resources/skins.minerva.mainMenu.icons/anonymous.svg",
"home":
"resources/skins.minerva.mainMenu.icons/home.svg",
--
To view, visit https://gerrit.wikimedia.org/r/403085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93264024f4915fc910c792b1905b89cdc6b8b546
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
