mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
synced 2024-11-23 22:03:39 +00:00
Drop message box styling modules from page load
The skins.minerva.messageBox.styles module is loaded on pages with old revisions, but this message box is already being styled by another module added by core. Skins are not responsible for styling Codex. This is the responsibility of the code that adds the message box to the page. In addition to this we were loading another set of styles for message boxes on skins.minerva.codex.styles Bug: T375287 Change-Id: I0cf5dc6baf2e447b4944f04365addd614d59cfbe
This commit is contained in:
parent
d2be5ce88f
commit
e76d536733
|
@ -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
|
@ -489,7 +489,6 @@
|
||||||
"skins.minerva.mainMenu.icons",
|
"skins.minerva.mainMenu.icons",
|
||||||
"skins.minerva.mainMenu.styles",
|
"skins.minerva.mainMenu.styles",
|
||||||
"mediawiki.cookie",
|
"mediawiki.cookie",
|
||||||
"skins.minerva.messageBox.styles",
|
|
||||||
"mediawiki.util",
|
"mediawiki.util",
|
||||||
"mediawiki.router",
|
"mediawiki.router",
|
||||||
"mediawiki.Title",
|
"mediawiki.Title",
|
||||||
|
@ -560,13 +559,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": [
|
||||||
|
@ -577,8 +569,7 @@
|
||||||
"class": "MediaWiki\\ResourceLoader\\CodexModule",
|
"class": "MediaWiki\\ResourceLoader\\CodexModule",
|
||||||
"codexStyleOnly": true,
|
"codexStyleOnly": true,
|
||||||
"codexComponents": [
|
"codexComponents": [
|
||||||
"CdxButton",
|
"CdxButton"
|
||||||
"CdxMessage"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -587,7 +578,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