jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396100 )
Change subject: Avoid OOUI/download icon nameclash
......................................................................
Avoid OOUI/download icon nameclash
Short term fix to ensure icon doesn't change
when oo-ui is loaded.
Prefix with 'mf-' (we do this in main menu) to avoid nameclashes
Bug: T182162
Change-Id: Ia6ceb620ed2710d97387a326b74f1a02236cd0d0
---
M resources/skins.minerva.scripts/DownloadIcon.js
M skin.json
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
jenkins-bot: Verified
VolkerE: Looks good to me, approved
Jdlrobson: Looks good to me, but someone else must approve
diff --git a/resources/skins.minerva.scripts/DownloadIcon.js
b/resources/skins.minerva.scripts/DownloadIcon.js
index 5f9e3d2..bbaeda2 100644
--- a/resources/skins.minerva.scripts/DownloadIcon.js
+++ b/resources/skins.minerva.scripts/DownloadIcon.js
@@ -2,6 +2,7 @@
var msg = mw.msg,
MAX_PRINT_TIMEOUT = 3000,
+ GLYPH = 'mf-download',
Icon = M.require( 'mobile.startup/Icon' );
/**
@@ -17,7 +18,7 @@
this.skin = skin;
options.tagName = 'li';
options.title = msg( 'minerva-download' );
- options.name = 'download';
+ options.name = GLYPH;
Icon.call( this, options );
}
@@ -33,7 +34,7 @@
* Restore download icon from spinner state
*/
hideSpinner: function () {
- this.options.name = 'download';
+ this.options.name = GLYPH;
this.render();
},
isTemplateMode: false,
diff --git a/skin.json b/skin.json
index 070d5fe..c1758a7 100644
--- a/skin.json
+++ b/skin.json
@@ -168,7 +168,7 @@
"selector": ".mw-ui-icon-{name}:before",
"position": "bottom",
"images": {
- "download":
"resources/skins.minerva.icons.images.scripts/download.svg",
+ "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",
--
To view, visit https://gerrit.wikimedia.org/r/396100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6ceb620ed2710d97387a326b74f1a02236cd0d0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
