golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Hygiene: Merge skins.minerva.base.reset into skins.minerva.base.styles"

This commit is contained in:
jenkins-bot 2019-01-18 17:13:52 +00:00 committed by Gerrit Code Review
parent a816f81278 24b1e7d54d
commit ffb97f5c9f
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/skins/SkinMinerva.php
View File

@ -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',

0
resources/skins.minerva.base.reset/reset.less → resources/skins.minerva.base.styles/reset.less
View File

10
skin.json
View File

@ -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",