mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
synced 2024-11-27 15:40:15 +00:00
Merge "Drop message box styling modules from page load"
This commit is contained in:
commit
769cf7f841
|
@ -1077,16 +1077,6 @@ class SkinMinerva extends SkinMustache {
|
||||||
$requestAction = $this->getActionName();
|
$requestAction = $this->getActionName();
|
||||||
$viewAction = $requestAction === 'view';
|
$viewAction = $requestAction === 'view';
|
||||||
|
|
||||||
// Warning box styles are needed when reviewing old revisions
|
|
||||||
// and inside the fallback editor styles to action=edit page.
|
|
||||||
if (
|
|
||||||
$title->getNamespace() !== NS_MAIN ||
|
|
||||||
$request->getCheck( 'oldid' ) ||
|
|
||||||
!$viewAction
|
|
||||||
) {
|
|
||||||
$styles[] = 'skins.minerva.messageBox.styles';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $title->isMainPage() ) {
|
if ( $title->isMainPage() ) {
|
||||||
$styles[] = 'skins.minerva.mainPage.styles';
|
$styles[] = 'skins.minerva.mainPage.styles';
|
||||||
} elseif ( $this->skinUserPageHelper->isUserPage() ) {
|
} elseif ( $this->skinUserPageHelper->isUserPage() ) {
|
||||||
|
|
12
skin.json
12
skin.json
|
@ -539,7 +539,6 @@
|
||||||
"skins.minerva.icons",
|
"skins.minerva.icons",
|
||||||
"skins.minerva.styles",
|
"skins.minerva.styles",
|
||||||
"mediawiki.cookie",
|
"mediawiki.cookie",
|
||||||
"skins.minerva.messageBox.styles",
|
|
||||||
"mediawiki.util",
|
"mediawiki.util",
|
||||||
"mediawiki.router",
|
"mediawiki.router",
|
||||||
"mediawiki.Title",
|
"mediawiki.Title",
|
||||||
|
@ -610,13 +609,6 @@
|
||||||
"watchstar.js"
|
"watchstar.js"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"skins.minerva.messageBox.styles": {
|
|
||||||
"class": "MediaWiki\\ResourceLoader\\CodexModule",
|
|
||||||
"codexStyleOnly": true,
|
|
||||||
"codexComponents": [
|
|
||||||
"CdxMessage"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"skins.minerva.categories.styles": {
|
"skins.minerva.categories.styles": {
|
||||||
"class": "MediaWiki\\ResourceLoader\\SkinModule",
|
"class": "MediaWiki\\ResourceLoader\\SkinModule",
|
||||||
"features": [
|
"features": [
|
||||||
|
@ -627,8 +619,7 @@
|
||||||
"class": "MediaWiki\\ResourceLoader\\CodexModule",
|
"class": "MediaWiki\\ResourceLoader\\CodexModule",
|
||||||
"codexStyleOnly": true,
|
"codexStyleOnly": true,
|
||||||
"codexComponents": [
|
"codexComponents": [
|
||||||
"CdxButton",
|
"CdxButton"
|
||||||
"CdxMessage"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -637,7 +628,6 @@
|
||||||
"remoteSkinPath": "MinervaNeue/tests/qunit/skins.minerva.scripts",
|
"remoteSkinPath": "MinervaNeue/tests/qunit/skins.minerva.scripts",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"mediawiki.cookie",
|
"mediawiki.cookie",
|
||||||
"skins.minerva.messageBox.styles",
|
|
||||||
"skins.minerva.scripts",
|
"skins.minerva.scripts",
|
||||||
"mobile.startup",
|
"mobile.startup",
|
||||||
"mediawiki.user",
|
"mediawiki.user",
|
||||||
|
|
Loading…
Reference in a new issue