jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Consolidate the 2 instances of the refresh icon (use
svg)
......................................................................
Hygiene: Consolidate the 2 instances of the refresh icon (use svg)
Rather than have 2 css rules, group them into one single rule.
Change-Id: I7c17927b4f863bd7333ca8413eeb47044009807d
---
M includes/MobileFrontend.hooks.php
M resources/mobile.ajax/refresh.png
R resources/mobile.ajax/refresh.svg
M resources/mobile.ajax/spinner.less
D resources/skins.minerva.special.userlogin.styles/icons/refresh.png
M resources/skins.minerva.special.userlogin.styles/userlogin.less
6 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 868b296..797bf57 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -647,7 +647,7 @@
if ( $name === 'Search' ) {
$out->addModuleStyles(
'skins.minerva.special.search.styles' );
} elseif ( $name === 'Userlogin' || $name ===
'CreateAccount' ) {
- $out->addModuleStyles(
'skins.minerva.special.userlogin.styles' );
+ $out->addModuleStyles( [ 'mobile.ajax',
'skins.minerva.special.userlogin.styles' ] );
$out->addModules(
'mobile.special.userlogin.scripts' );
}
}
diff --git a/resources/mobile.ajax/refresh.png
b/resources/mobile.ajax/refresh.png
index 9a0f1c4..8dc3b67 100644
--- a/resources/mobile.ajax/refresh.png
+++ b/resources/mobile.ajax/refresh.png
Binary files differ
diff --git a/resources/skins.minerva.special.userlogin.styles/icons/refresh.svg
b/resources/mobile.ajax/refresh.svg
similarity index 100%
rename from resources/skins.minerva.special.userlogin.styles/icons/refresh.svg
rename to resources/mobile.ajax/refresh.svg
diff --git a/resources/mobile.ajax/spinner.less
b/resources/mobile.ajax/spinner.less
index 2410077..6d50f2a 100644
--- a/resources/mobile.ajax/spinner.less
+++ b/resources/mobile.ajax/spinner.less
@@ -8,8 +8,10 @@
.m-background-image( 'ajax-loader.gif' );
}
+// FIXME: Standardise on a loading class (update ConfirmEdit extension)
+.fancycaptcha-reload,
.mw-ui-icon-refresh {
- .m-background-image( 'refresh.png' );
+ .m-background-image-svg( 'refresh.svg', 'refresh.png' );
}
// Asynchronous loading
diff --git a/resources/skins.minerva.special.userlogin.styles/icons/refresh.png
b/resources/skins.minerva.special.userlogin.styles/icons/refresh.png
deleted file mode 100644
index 8dc3b67..0000000
--- a/resources/skins.minerva.special.userlogin.styles/icons/refresh.png
+++ /dev/null
Binary files differ
diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 66e1780..e487f7b 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -31,8 +31,8 @@
font-weight: bold;
background: none;
&:before {
+ // Note icon is provided in mobile.ajax
content: '';
- .background-image-svg( 'icons/refresh.svg',
'icons/refresh.png' );
background-position: center left;
background-repeat: no-repeat;
background-size: 16px;
--
To view, visit https://gerrit.wikimedia.org/r/292162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c17927b4f863bd7333ca8413eeb47044009807d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
