Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/210363
Change subject: Load icons only needed in JS via JS
......................................................................
Load icons only needed in JS via JS
Bug: T98871
Change-Id: I537e8d55c84f094ed04642e774e85f08c9fa550b
---
M includes/Resources.php
M less/iconsNew.less
R resources/skins.minerva.icons.images.legacy/ajax-loader.gif
R resources/skins.minerva.icons.images.legacy/back-ltr.png
R resources/skins.minerva.icons.images.legacy/back-rtl.png
R resources/skins.minerva.icons.images.legacy/camera.png
R resources/skins.minerva.icons.images.legacy/cancel.png
R resources/skins.minerva.icons.images.legacy/clear.png
A resources/skins.minerva.icons.images.legacy/icons.less
R resources/skins.minerva.icons.images.legacy/refresh.png
10 files changed, 40 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/63/210363/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 07d61d6..4868e77 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -89,6 +89,13 @@
)
),
+ 'skins.minerva.icons.images.legacy' =>
$wgMFResourceFileModuleBoilerplate + array(
+ 'position' => 'top',
+ 'styles' => array(
+
'resources/skins.minerva.icons.images.legacy/icons.less',
+ ),
+ ),
+
'skins.minerva.icons.images.js' => $wgMFResourceFileModuleBoilerplate +
array(
'class' => 'ResourceLoaderImageModule',
'prefix' => 'mw-ui',
@@ -1805,6 +1812,7 @@
'mobile.startup',
'mobile.loggingSchemas',
'skins.minerva.icons.images.js',
+ 'skins.minerva.icons.images.legacy',
// Feature modules that should be loaded in stable.
// These modules should only setup routes/events or
// load code under certain conditions.
diff --git a/less/iconsNew.less b/less/iconsNew.less
index 79927f6..290f12d 100644
--- a/less/iconsNew.less
+++ b/less/iconsNew.less
@@ -3,35 +3,6 @@
@import "minerva.mixins";
@import "mediawiki.mixins";
-.mw-ui-icon-refresh {
- .m-background-image('images/refresh.png');
-}
-
-// overlay set
-
-.mw-ui-icon-cancel {
- .m-background-image('images/cancel.png');
-}
-
-.mw-ui-icon-clear {
- .m-background-image('images/clear.png');
-}
-
-
-// Uploads set
-.mw-ui-icon-photo {
- .m-background-image('images/camera.png');
-}
-
-.mw-ui-icon-back {
- .m-background-image('images/back-ltr.png');
-}
-// FIXME: END
-
-.mw-ui-icon-spinner {
- .m-background-image('images/ajax-loader.gif');
-}
-
// FIXME: Find better workaround for this
span.mw-ui-icon {
// a block inside an inline element is never a good idea - effects line
height of mobile diff bytesadded class
diff --git a/less/images/ajax-loader.gif
b/resources/skins.minerva.icons.images.legacy/ajax-loader.gif
similarity index 100%
rename from less/images/ajax-loader.gif
rename to resources/skins.minerva.icons.images.legacy/ajax-loader.gif
Binary files differ
diff --git a/less/images/back-ltr.png
b/resources/skins.minerva.icons.images.legacy/back-ltr.png
similarity index 100%
rename from less/images/back-ltr.png
rename to resources/skins.minerva.icons.images.legacy/back-ltr.png
Binary files differ
diff --git a/less/images/back-rtl.png
b/resources/skins.minerva.icons.images.legacy/back-rtl.png
similarity index 100%
rename from less/images/back-rtl.png
rename to resources/skins.minerva.icons.images.legacy/back-rtl.png
Binary files differ
diff --git a/less/images/camera.png
b/resources/skins.minerva.icons.images.legacy/camera.png
similarity index 100%
rename from less/images/camera.png
rename to resources/skins.minerva.icons.images.legacy/camera.png
Binary files differ
diff --git a/less/images/cancel.png
b/resources/skins.minerva.icons.images.legacy/cancel.png
similarity index 100%
rename from less/images/cancel.png
rename to resources/skins.minerva.icons.images.legacy/cancel.png
Binary files differ
diff --git a/less/images/clear.png
b/resources/skins.minerva.icons.images.legacy/clear.png
similarity index 100%
rename from less/images/clear.png
rename to resources/skins.minerva.icons.images.legacy/clear.png
Binary files differ
diff --git a/resources/skins.minerva.icons.images.legacy/icons.less
b/resources/skins.minerva.icons.images.legacy/icons.less
new file mode 100644
index 0000000..1dd0858
--- /dev/null
+++ b/resources/skins.minerva.icons.images.legacy/icons.less
@@ -0,0 +1,32 @@
+// FIXME: Generate via ResourceLoaderImageModule
+@import "minerva.variables";
+@import "minerva.mixins";
+@import "mediawiki.mixins";
+
+
+.mw-ui-icon-refresh {
+ .m-background-image('refresh.png');
+}
+
+// overlay set
+.mw-ui-icon-cancel {
+ .m-background-image('cancel.png');
+}
+
+.mw-ui-icon-clear {
+ .m-background-image('clear.png');
+}
+
+// Uploads set
+.mw-ui-icon-photo {
+ .m-background-image('camera.png');
+}
+
+.mw-ui-icon-back {
+ .m-background-image('back-ltr.png');
+}
+// FIXME: END
+
+.mw-ui-icon-spinner {
+ .m-background-image('images/ajax-loader.gif');
+}
\ No newline at end of file
diff --git a/less/images/refresh.png
b/resources/skins.minerva.icons.images.legacy/refresh.png
similarity index 100%
rename from less/images/refresh.png
rename to resources/skins.minerva.icons.images.legacy/refresh.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/210363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I537e8d55c84f094ed04642e774e85f08c9fa550b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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
