wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-28 08:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

skins.minerva.tablet.styles can be merged

Browse source 
This module is unnecessary - it's loaded unconditionally on a page.
Instead bundle the related CSS inside skins.minerva.content.styles

Change-Id: Ieb37d63332ff5b0cf39835b64cc9f0dcaf62c34f
This commit is contained in:
jdlrobson 2019-01-10 16:28:25 -08:00
parent de3439ffff
commit 1166009c00
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',
'skins.minerva.content.styles.images', 'skins.minerva.content.styles.images',
'mediawiki.hlist', 'mediawiki.hlist',
'skins.minerva.tablet.styles',
'mediawiki.ui.icon', 'mediawiki.ui.icon',
'mediawiki.ui.button', 'mediawiki.ui.button',
'skins.minerva.icons.images', '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. A file for css that optimises the Minerva skin on larger devices.
*/ */
@import '../../minerva.less/minerva.variables'; @import '../../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins'; @import '../../../minerva.less/minerva.mixins';
@paddingVertical: 1.4em; @paddingVertical: 1.4em;
@media screen and ( min-width: @width-breakpoint-tablet ) { @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. FIXME: Review all of these hacks to see if they still apply.
*/ */
@import '../../minerva.less/minerva.variables'; @import '../../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins'; @import '../../../minerva.less/minerva.mixins';
/* Tablet specific styling */ /* Tablet specific styling */
@media all and ( min-width: @width-breakpoint-tablet ) { @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

@ -185,7 +185,8 @@
"desktop" "desktop"
], ],
"styles": [ "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": { "skins.minerva.content.styles.images": {
@ -203,16 +204,6 @@
} }
} }
}, },
"skins.minerva.tablet.styles": {
"class": "MediaWiki\\Minerva\\ResourceLoaderLessVarFileModule",
"targets": [
"mobile",
"desktop"
],
"styles": [
"resources/skins.minerva.tablet.styles/styles.less"
]
},
"skins.minerva.icons.loggedin": { "skins.minerva.icons.loggedin": {
"class": "ResourceLoaderImageModule", "class": "ResourceLoaderImageModule",
"selector": ".mw-ui-icon-minerva-{name}:before", "selector": ".mw-ui-icon-minerva-{name}:before",