jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347207 )
Change subject: Make ResourceLoader modules more modular
......................................................................
Make ResourceLoader modules more modular
Change-Id: Iee82b250bfc556c34e655fb81f9113d0b96b0dd3
---
R material/styles/mediawiki/skinning.interface.less
R material/styles/mediawiki/toc.less
M skin.json
3 files changed, 29 insertions(+), 23 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/material/styles/components/md-ui.components.categories.less
b/material/styles/mediawiki/skinning.interface.less
similarity index 100%
rename from material/styles/components/md-ui.components.categories.less
rename to material/styles/mediawiki/skinning.interface.less
diff --git a/material/styles/components/md-ui.components.toc.less
b/material/styles/mediawiki/toc.less
similarity index 100%
rename from material/styles/components/md-ui.components.toc.less
rename to material/styles/mediawiki/toc.less
diff --git a/skin.json b/skin.json
index 489a7b6..a504731 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
{
"name": "Material",
"namemsg": "skinname-material",
- "version": "1.3.3",
+ "version": "1.3.4",
"author": [
"[https://mediawiki.org/wiki/User:SamanthaNguyen
SamanthaNguyen]",
"[https://mediawiki.org/wiki/User:MtMNC MtMNC]",
@@ -30,6 +30,31 @@
},
"ResourceModules": {
"skins.material": {
+ "dependencies": [
+ "skins.material.components",
+ "skins.material.base"
+ ]
+ },
+ "skins.material.components": {
+ "styles": {
+
"material/styles/components/md-ui.components.datatable.less": {
+ "media": "screen"
+ },
+
"material/styles/components/md-ui.components.footer.less": {
+ "media": "screen"
+ },
+
"material/styles/components/md-ui.components.header.less": {
+ "media": "screen"
+ },
+
"material/styles/components/md-ui.components.sidebar.less": {
+ "media": "screen"
+ },
+
"material/styles/components/md-ui.components.tabs.less": {
+ "media": "screen"
+ }
+ }
+ },
+ "skins.material.base": {
"styles": {
"material/styles/base/md-ui.base.print.less": {
"media": "print"
@@ -48,34 +73,15 @@
},
"material/styles/base/md-ui.base.main.less": {
"media": "screen"
- },
-
"material/styles/components/md-ui.components.categories.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.datatable.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.footer.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.header.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.sidebar.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.tabs.less": {
- "media": "screen"
- },
-
"material/styles/components/md-ui.components.toc.less": {
- "media": "screen"
}
}
}
},
"ResourceModuleSkinStyles": {
"material": {
- "+mediawiki.special.preferences.styles":
"material/styles/mediawiki/specials.preferences.styles.less"
+ "+mediawiki.skinning.interface":
"material/styles/mediawiki/skinning.interface.css",
+ "+mediawiki.special.preferences.styles":
"material/styles/mediawiki/specials.preferences.styles.less",
+ "+mediawiki.toc": "material/styles/mediawiki/toc.less"
}
},
"manifest_version": 1
--
To view, visit https://gerrit.wikimedia.org/r/347207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee82b250bfc556c34e655fb81f9113d0b96b0dd3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Material
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: SamanthaNguyen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits