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

Merge "Minerva should use mediawiki.hlist"

Browse source
This commit is contained in:
jenkins-bot 2017-07-21 18:47:34 +00:00 committed by Gerrit Code Review
parent 7d0501127f 747b712509
commit bd898e2be4
4 changed files with 46 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/skins/SkinMinerva.php
View file

@ -1352,6 +1352,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
'skins.minerva.base.reset', 'skins.minerva.base.reset',
'skins.minerva.base.styles', 'skins.minerva.base.styles',
'skins.minerva.content.styles', 'skins.minerva.content.styles',
'mediawiki.hlist',
'skins.minerva.tablet.styles', 'skins.minerva.tablet.styles',
'mediawiki.ui.icon', 'mediawiki.ui.icon',
'mediawiki.ui.button', 'mediawiki.ui.button',

33
resources/skins.minerva.content.styles/lists.less
View file

@ -2,25 +2,8 @@
@import 'minerva.variables.less'; @import 'minerva.variables.less';
@import 'minerva.mixins.less'; @import 'minerva.mixins.less';
// FIXME: to support hlists on enwiki projects - this should be deprecated // FIXME: Delete this in 7 days time (T42062)
.hlist > ul, @import '../../skinStyles/mediawiki.hlist/minerva.less';
// Horizontal Lists
//
// Use hlist class when dealing with lists where items should be horizontal.
//
// Markup:
// <ul class="hlist">
// <li>item 1</li>
// <li>item 2</li>
// </ul>
//
// Styleguide 1.5.
ul.hlist {
li {
display: inline-block;
margin-right: 8px;
}
}
.content { .content {
ul { ul {
@ -80,15 +63,3 @@ body.mw-hide-empty-elt .mw-empty-elt {
display: none; display: none;
} }
.hlist-separated {
li:after {
content: '•';
padding-left: 8px;
color: @linkColor;
font-size: 16px;
line-height: 1;
}
:last-child:after {
content: '';
}
}

3
skin.json
View file

@ -36,6 +36,9 @@
}, },
"ResourceModuleSkinStyles": { "ResourceModuleSkinStyles": {
"minerva": { "minerva": {
"mediawiki.hlist": [
"skinStyles/mediawiki.hlist/minerva.less"
],
"mobile.languages.structured": [ "mobile.languages.structured": [
"skinStyles/mobile.languages.structured/LanguageOverlay.less" "skinStyles/mobile.languages.structured/LanguageOverlay.less"
], ],

40
skinStyles/mediawiki.hlist/minerva.less Normal file
View file

@ -0,0 +1,40 @@
@import 'minerva.variables.less';
/**
* This tweaks the default mediawiki.hlist module to provide performance optimisations
* as well as subtle tweaks to the appearance. It's a work in progress.
*/
// FIXME: to support hlists on enwiki projects - this should be deprecated
.hlist > ul,
.hlist > dl,.hlist > ul,
// Horizontal Lists
//
// Use hlist class when dealing with lists where items should be horizontal.
//
// Markup:
// <ul class="hlist">
// <li>item 1</li>
// <li>item 2</li>
// </ul>
//
// Styleguide 1.5.
ul.hlist {
li {
display: inline-block;
margin-right: 8px;
}
}
.hlist-separated {
li:after {
content: '•';
padding-left: 8px;
color: @linkColor;
font-size: 16px;
line-height: 1;
}
:last-child:after {
content: '';
}
}