jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351563 )
Change subject: Use upstreamed mixins
......................................................................
Use upstreamed mixins
Remove usages of m-background-image-svg-quick.
There also removes a usage of the discouraged m-background-image
from the ajax spinner as this uses a GIF and is a special case that will
not be fixed by using ResourceLoaderImage module.
Depends-On: Iad3f568c4e7dbd7bd5a8c2058fe4b467750a9f07
Change-Id: I53cea1e1095e3a67f3c44ede2dcd4e9d21c9695f
---
M minerva.less/minerva.mixins.less
M resources/mobile.ajax.styles/spinner.less
2 files changed, 9 insertions(+), 40 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
Jdlrobson: Looks good to me, approved
diff --git a/minerva.less/minerva.mixins.less b/minerva.less/minerva.mixins.less
index b12c6f6..4e41da1 100644
--- a/minerva.less/minerva.mixins.less
+++ b/minerva.less/minerva.mixins.less
@@ -1,49 +1,14 @@
@import 'mediawiki.mixins.less';
@import 'mediawiki.mixins.animation.less';
-// Shorthand for background-image-svg in core
-.background-image-svg-quick( @url ) {
- .background-image-svg( ~'@{url}.svg', ~'@{url}.png' );
-}
-
+// FIXME: This mixin should not be necessary and only exists because of
+// https://phabricator.wikimedia.org/T142532
+// Please do not use it.
.m-background-image( @url ) {
&:after,
&:before {
.background-image( @url );
}
-}
-
-.m-background-image-svg( @svg, @fallback ) {
- &:after,
- &:before {
- .background-image-svg( @svg, @fallback );
- }
-}
-
-.m-background-image-svg-quick( @url ) {
- .m-background-image-svg( ~'@{url}.svg', ~'@{url}.png' );
-}
-
-.transform( @transform ) {
- -webkit-transform: @transform;
- transform: @transform;
-}
-
-.transition( ... ) {
- // avoid Webkit bugs
- -webkit-backface-visibility: hidden;
-
- -webkit-transition: @arguments;
- transition: @arguments;
-}
-
-// can't use `.transition()` because WebKit requires `-webkit-` prefix before
`transform`
-.transition-transform( ... ) {
- // avoid Webkit bugs
- -webkit-backface-visibility: hidden;
-
- -webkit-transition: -webkit-transform @arguments;
- transition: transform @arguments;
}
// Generic mixin for applying styles to text that accompanies/adds context to
workflows
diff --git a/resources/mobile.ajax.styles/spinner.less
b/resources/mobile.ajax.styles/spinner.less
index 4766898..a4d5297 100644
--- a/resources/mobile.ajax.styles/spinner.less
+++ b/resources/mobile.ajax.styles/spinner.less
@@ -5,13 +5,17 @@
// FIXME: Standardise on a loading class (update ConfirmEdit extension)
.fancycaptcha-reload-loading,
.mw-ui-icon-spinner {
- .m-background-image( 'images/ajax-loader.gif' );
+ &:before {
+ .background-image( 'images/ajax-loader.gif' );
+ }
}
// FIXME: Standardise on a loading class (update ConfirmEdit extension)
.fancycaptcha-reload,
.mw-ui-icon-refresh {
- .m-background-image-svg-quick( 'images/refresh' );
+ &:before {
+ .background-image-svg-quick( 'images/refresh' );
+ }
}
// Asynchronous loading
--
To view, visit https://gerrit.wikimedia.org/r/351563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53cea1e1095e3a67f3c44ede2dcd4e9d21c9695f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Krinkle <[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
