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

Merge "skins.minerva.tablet.styles can be merged"

This commit is contained in:
jenkins-bot 2019-01-18 17:13:51 +00:00 committed by Gerrit Code Review
parent a357452f8a 1166009c00
commit a816f81278
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/skins/SkinMinerva.php
View File

@ -1431,7 +1431,6 @@ class SkinMinerva extends SkinTemplate {
'skins.minerva.content.styles',
'skins.minerva.content.styles.images',
'mediawiki.hlist',
'skins.minerva.tablet.styles',
'mediawiki.ui.icon',
'mediawiki.ui.button',
'skins.minerva.icons.images',

4
resources/skins.minerva.tablet.styles/common.less → resources/skins.minerva.content.styles/tablet/common.less
View File

@ -2,8 +2,8 @@
A file for css that optimises the Minerva skin on larger devices.
*/
@import '../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins';
@import '../../../minerva.less/minerva.variables';
@import '../../../minerva.less/minerva.mixins';
@paddingVertical: 1.4em;
@media screen and ( min-width: @width-breakpoint-tablet ) {

4
resources/skins.minerva.tablet.styles/hacks.less → resources/skins.minerva.content.styles/tablet/hacks.less
View File

@ -8,8 +8,8 @@ https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates
FIXME: Review all of these hacks to see if they still apply.
*/
@import '../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins';
@import '../../../minerva.less/minerva.variables';
@import '../../../minerva.less/minerva.mixins';
/* Tablet specific styling */
@media all and ( min-width: @width-breakpoint-tablet ) {

0
resources/skins.minerva.tablet.styles/styles.less → resources/skins.minerva.content.styles/tablet/styles.less
View File

13
skin.json
View File

@ -188,7 +188,8 @@
"desktop"
],
"styles": [
"resources/skins.minerva.content.styles/styles.less"
"resources/skins.minerva.content.styles/styles.less",
"resources/skins.minerva.content.styles/tablet/styles.less"
]
},
"skins.minerva.content.styles.images": {
@ -206,16 +207,6 @@
}
}
},
"skins.minerva.tablet.styles": {
"class": "MediaWiki\\Minerva\\ResourceLoaderLessVarFileModule",
"targets": [
"mobile",
"desktop"
],
"styles": [
"resources/skins.minerva.tablet.styles/styles.less"
]
},
"skins.minerva.icons.loggedin": {
"class": "ResourceLoaderImageModule",
"selector": ".mw-ui-icon-minerva-{name}:before",