Merge "Hygiene: Merge skins.minerva.base.reset into skins.minerva.base.styles"
This commit is contained in:
commit
ffb97f5c9f
|
@ -1426,7 +1426,6 @@ class SkinMinerva extends SkinTemplate {
|
||||||
protected function getSkinStyles() {
|
protected function getSkinStyles() {
|
||||||
$title = $this->getTitle();
|
$title = $this->getTitle();
|
||||||
$styles = [
|
$styles = [
|
||||||
'skins.minerva.base.reset',
|
|
||||||
'skins.minerva.base.styles',
|
'skins.minerva.base.styles',
|
||||||
'skins.minerva.content.styles',
|
'skins.minerva.content.styles',
|
||||||
'skins.minerva.content.styles.images',
|
'skins.minerva.content.styles.images',
|
||||||
|
|
10
skin.json
10
skin.json
|
@ -158,21 +158,13 @@
|
||||||
"WebClientError": 18340282
|
"WebClientError": 18340282
|
||||||
},
|
},
|
||||||
"ResourceModules": {
|
"ResourceModules": {
|
||||||
"skins.minerva.base.reset": {
|
|
||||||
"targets": [
|
|
||||||
"mobile",
|
|
||||||
"desktop"
|
|
||||||
],
|
|
||||||
"styles": [
|
|
||||||
"resources/skins.minerva.base.reset/reset.less"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"skins.minerva.base.styles": {
|
"skins.minerva.base.styles": {
|
||||||
"targets": [
|
"targets": [
|
||||||
"mobile",
|
"mobile",
|
||||||
"desktop"
|
"desktop"
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
|
"resources/skins.minerva.base.styles/reset.less",
|
||||||
"resources/skins.minerva.base.styles/ui.less",
|
"resources/skins.minerva.base.styles/ui.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",
|
||||||
|
|
Loading…
Reference in New Issue