Restrict AMC scripts and styles to AMC mode
These have leaked into all users experience. The CSS appears to be unused outside AMC. Also remove a reference to skins.minerva.share which does not exist. See I171831469a6733c458bc5c7ba249a5096ca975b8 which introduced these styles. Bug: T227929 Change-Id: I6af6b026e68e11327b7c4e3edfc4f812c7309e2e
This commit is contained in:
parent
e01cb1fa14
commit
a82ca2fcef
@ -845,9 +845,6 @@ class SkinMinerva extends SkinTemplate {
|
|||||||
if ( $this->skinOptions->hasSkinOptions() ) {
|
if ( $this->skinOptions->hasSkinOptions() ) {
|
||||||
$modules[] = 'skins.minerva.options';
|
$modules[] = 'skins.minerva.options';
|
||||||
}
|
}
|
||||||
if ( $this->skinOptions->get( SkinOptions::OPTION_SHARE_BUTTON ) ) {
|
|
||||||
$modules[] = 'skins.minerva.share';
|
|
||||||
}
|
|
||||||
|
|
||||||
return $modules;
|
return $modules;
|
||||||
}
|
}
|
||||||
@ -930,7 +927,6 @@ class SkinMinerva extends SkinTemplate {
|
|||||||
'mediawiki.ui.button',
|
'mediawiki.ui.button',
|
||||||
'skins.minerva.icons.images',
|
'skins.minerva.icons.images',
|
||||||
'skins.minerva.mainMenu.icons',
|
'skins.minerva.mainMenu.icons',
|
||||||
'wikimedia.ui'
|
|
||||||
];
|
];
|
||||||
if ( $title->isMainPage() ) {
|
if ( $title->isMainPage() ) {
|
||||||
$styles[] = 'skins.minerva.mainPage.styles';
|
$styles[] = 'skins.minerva.mainPage.styles';
|
||||||
@ -945,6 +941,7 @@ class SkinMinerva extends SkinTemplate {
|
|||||||
|
|
||||||
if ( $this->skinOptions->get( SkinOptions::OPTION_AMC ) ) {
|
if ( $this->skinOptions->get( SkinOptions::OPTION_AMC ) ) {
|
||||||
$styles[] = 'skins.minerva.amc.styles';
|
$styles[] = 'skins.minerva.amc.styles';
|
||||||
|
$styles[] = 'wikimedia.ui';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $styles;
|
return $styles;
|
||||||
|
@ -198,9 +198,6 @@
|
|||||||
"styles": [
|
"styles": [
|
||||||
"resources/skins.minerva.base.styles/reset.less",
|
"resources/skins.minerva.base.styles/reset.less",
|
||||||
"resources/skins.minerva.base.styles/ui.less",
|
"resources/skins.minerva.base.styles/ui.less",
|
||||||
"components/ToggleList/ToggleList.less",
|
|
||||||
"components/ToggleList/DropDownList.less",
|
|
||||||
"components/ToggleList/MenuListItem.less",
|
|
||||||
"resources/skins.minerva.base.styles/pageactions.less",
|
"resources/skins.minerva.base.styles/pageactions.less",
|
||||||
"resources/skins.minerva.base.styles/common.less",
|
"resources/skins.minerva.base.styles/common.less",
|
||||||
"resources/skins.minerva.base.styles/images.less",
|
"resources/skins.minerva.base.styles/images.less",
|
||||||
@ -255,7 +252,10 @@
|
|||||||
"desktop"
|
"desktop"
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
"resources/skins.minerva.amc.styles/index.less"
|
"resources/skins.minerva.amc.styles/index.less",
|
||||||
|
"components/ToggleList/ToggleList.less",
|
||||||
|
"components/ToggleList/DropDownList.less",
|
||||||
|
"components/ToggleList/MenuListItem.less"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"wikimedia.ui": {
|
"wikimedia.ui": {
|
||||||
|
Loading…
Reference in New Issue
Block a user