jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365421 )
Change subject: Load ResourceLoader modules correctly
......................................................................
Load ResourceLoader modules correctly
Few other changes:
- (indefinitely) remove some WIP stylesheets from loading,
which are currently the motion, print, and icon stylesheets.
- Fix header positioning.
Change-Id: I044b0eb56ed60069a86bed5c1439aefd6970798f
---
M Material.skin.php
M material/styles/components/md-ui.components.header.less
M skin.json
3 files changed, 5 insertions(+), 18 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Material.skin.php b/Material.skin.php
index 9d002c8..89f8513 100644
--- a/Material.skin.php
+++ b/Material.skin.php
@@ -35,7 +35,8 @@
parent::setupSkinUserCss( $out );
$out->addModuleStyles( array(
'mediawiki.skinning.interface',
- 'skins.material'
+ 'skins.material.base',
+ 'skins.material.components'
) );
}
}
diff --git a/material/styles/components/md-ui.components.header.less
b/material/styles/components/md-ui.components.header.less
index a8d8a80..869bb5e 100644
--- a/material/styles/components/md-ui.components.header.less
+++ b/material/styles/components/md-ui.components.header.less
@@ -5,6 +5,7 @@
width: 100%;
position: fixed;
z-index: 2;
+ margin-top: -0.5em;
> a:first-child img {
display: none;
}
diff --git a/skin.json b/skin.json
index 0ffd99b..b351f1d 100644
--- a/skin.json
+++ b/skin.json
@@ -1,7 +1,7 @@
{
"name": "Material",
"namemsg": "skinname-material",
- "version": "1.3.5",
+ "version": "1.4.0",
"author": [
"[https://mediawiki.org/wiki/User:SamanthaNguyen
SamanthaNguyen]",
"[https://mediawiki.org/wiki/User:MtMNC MtMNC]",
@@ -32,12 +32,6 @@
"remoteSkinPath": "Material"
},
"ResourceModules": {
- "skins.material": {
- "dependencies": [
- "skins.material.components",
- "skins.material.base"
- ]
- },
"skins.material.components": {
"styles": {
"material/styles/components/md-ui.components.datatable.less": {
@@ -59,16 +53,7 @@
},
"skins.material.base": {
"styles": {
- "material/styles/base/md-ui.base.print.less": {
- "media": "print"
- },
"material/styles/base/md-ui.base.colors.less": {
- "media": "screen"
- },
- "material/styles/base/md-ui.base.icons.less": {
- "media": "screen"
- },
- "material/styles/base/md-ui.base.motion.less": {
"media": "screen"
},
"material/styles/base/md-ui.base.variables.less": {
@@ -82,7 +67,7 @@
},
"ResourceModuleSkinStyles": {
"material": {
- "+mediawiki.skinning.interface":
"material/styles/mediawiki/skinning.interface.css",
+ "+mediawiki.skinning.interface":
"material/styles/mediawiki/skinning.interface.less",
"+mediawiki.special.preferences.styles":
"material/styles/mediawiki/specials.preferences.styles.less",
"+mediawiki.toc": "material/styles/mediawiki/toc.less"
}
--
To view, visit https://gerrit.wikimedia.org/r/365421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I044b0eb56ed60069a86bed5c1439aefd6970798f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Material
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com>
Gerrit-Reviewer: SamanthaNguyen <samanthanguyen1...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
