jenkins-bot has submitted this change and it was merged.
Change subject: Use ResourceLoaderImageModule's CSS selector templates
......................................................................
Use ResourceLoaderImageModule's CSS selector templates
Depends on I99ccaf25 in mediawiki/core.
Bug: T78215
Change-Id: If2958e43afa4779c267e76d813b80cd3696a34e6
---
M includes/Resources.php
1 file changed, 29 insertions(+), 27 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 2bff820..c5025ba 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -80,46 +80,48 @@
'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate +
array(
'class' => 'ResourceLoaderImageModule',
'prefix' => 'mw-ui',
+ 'selectorWithoutVariant' => '.mw-ui-icon-{name}:before',
+ // Not used yet, see FIXME below
+ 'selectorWithVariant' => '.mw-ui-icon-{name}-{variant}:before',
'images' => array(
- // FIXME: ':before' suffix should be configurable in
image module.
'icon' => array(
// chrome
- 'notifications:before' =>
'images/icons/bell.svg',
- 'mainmenu:before' =>
'images/icons/hamburger.svg',
- 'search:before' =>
'images/icons/magnifying-glass.svg',
+ 'notifications' => 'images/icons/bell.svg',
+ 'mainmenu' => 'images/icons/hamburger.svg',
+ 'search' => 'images/icons/magnifying-glass.svg',
// toggling
- 'arrow-down:before' =>
'images/icons/arrow-down.svg',
- 'arrow-up:before' =>
'images/icons/arrow-up.svg',
+ 'arrow-down' => 'images/icons/arrow-down.svg',
+ 'arrow-up' => 'images/icons/arrow-up.svg',
// page actions
- 'talk:before' => 'images/icons/talk.svg',
- 'watch:before' => 'images/icons/watch.svg',
- 'watched:before' => 'images/icons/watched.svg',
- 'edit:before' => 'images/icons/editLocked.svg',
- 'edit-enabled:before' =>
'images/icons/edit.svg',
- 'addimage:before' =>
'images/icons/uploadLocked.svg',
- 'addimage-enabled:before' =>
'images/icons/upload.svg',
+ 'talk' => 'images/icons/talk.svg',
+ 'watch' => 'images/icons/watch.svg',
+ 'watched' => 'images/icons/watched.svg',
+ 'edit' => 'images/icons/editLocked.svg',
+ 'edit-enabled' => 'images/icons/edit.svg',
+ 'addimage' => 'images/icons/uploadLocked.svg',
+ 'addimage-enabled' => 'images/icons/upload.svg',
// Editor
- 'edit-source:before' =>
'images/icons/editSourceNormal.svg',
- 'edit-ve:before' =>
'images/icons/editVeNormal.svg',
- 'edit-switch:before' =>
'images/icons/editToggle.svg',
+ 'edit-source' =>
'images/icons/editSourceNormal.svg',
+ 'edit-ve' => 'images/icons/editVeNormal.svg',
+ 'edit-switch' => 'images/icons/editToggle.svg',
// TOC
- 'toc:before' => 'images/icons/contents-ltr.svg',
+ 'toc' => 'images/icons/contents-ltr.svg',
// Issues
- 'cleanup:before' =>
'images/icons/blue-triangle.svg',
+ 'cleanup' => 'images/icons/blue-triangle.svg',
// FIXME: make this a variant of cleanup
- 'cleanup-gray:before' =>
'images/icons/gray-triangle.svg',
+ 'cleanup-gray' =>
'images/icons/gray-triangle.svg',
// User
- 'user:before' => 'images/icons/userNormal.svg',
- 'anonymous:before' =>
'images/icons/userAnonymous.svg',
+ 'user' => 'images/icons/userNormal.svg',
+ 'anonymous' => 'images/icons/userAnonymous.svg',
// cite
- 'citation:before' => 'images/icons/cite.svg',
+ 'citation' => 'images/icons/cite.svg',
),
),
),
@@ -132,14 +134,14 @@
),
'skins.minerva.beta.images' => $wgMFResourceFileModuleBoilerplate +
array(
'class' => 'ResourceLoaderImageModule',
- 'prefix' => 'mw-ui',
+ 'selector' => '.mw-ui-icon-{name}:before',
'images' => array(
'icon' => array(
// page actions
- 'watch:before' => 'images/icons/beta/watch.svg',
- 'watched:before' =>
'images/icons/beta/watched.svg',
- 'edit:before' =>
'images/icons/beta/editLocked.svg',
- 'edit-enabled:before' =>
'images/icons/beta/edit.svg',
+ 'watch' => 'images/icons/beta/watch.svg',
+ 'watched' => 'images/icons/beta/watched.svg',
+ 'edit' => 'images/icons/beta/editLocked.svg',
+ 'edit-enabled' => 'images/icons/beta/edit.svg',
),
),
),
--
To view, visit https://gerrit.wikimedia.org/r/199130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2958e43afa4779c267e76d813b80cd3696a34e6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
