Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356775 )
Change subject: Minerva should use mediawiki.hlist ...................................................................... Minerva should use mediawiki.hlist Override provided styles Bug: T42062 Depends-On: I9305af5d30c8c24b44f4a0c6a466581c45fa3028 Change-Id: I7adda8ef99e5eee3df5bd7dc4da5081c1225f815 --- M extension.json M includes/skins/SkinMinerva.php M resources/skins.minerva.content.styles/lists.less A skinStyles/mediawiki.hlist/minerva.less 4 files changed, 36 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/75/356775/1 diff --git a/extension.json b/extension.json index 66b0b52..36101e1 100644 --- a/extension.json +++ b/extension.json @@ -1617,6 +1617,9 @@ ] }, "minerva": { + "mediawiki.hlist": [ + "skinStyles/mediawiki.hlist/minerva.less" + ], "ext.echo.styles.special": [ "skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less" ], diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 2a6e605..789a7f3 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -1380,6 +1380,7 @@ 'skins.minerva.base.reset', 'skins.minerva.base.styles', 'skins.minerva.content.styles', + 'mediawiki.hlist', 'skins.minerva.tablet.styles', 'mediawiki.ui.icon', 'mediawiki.ui.button', diff --git a/resources/skins.minerva.content.styles/lists.less b/resources/skins.minerva.content.styles/lists.less index c44176a..2d318c2 100644 --- a/resources/skins.minerva.content.styles/lists.less +++ b/resources/skins.minerva.content.styles/lists.less @@ -2,26 +2,6 @@ @import 'minerva.variables.less'; @import 'minerva.mixins.less'; -// FIXME: to support hlists on enwiki projects - this should be deprecated -.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; - } -} - .content { ul { list-style: square inside; @@ -80,15 +60,3 @@ display: none; } -.hlist-separated { - li:after { - content: '•'; - padding-left: 8px; - color: @linkColor; - font-size: 16px; - line-height: 1; - } - :last-child:after { - content: ''; - } -} diff --git a/skinStyles/mediawiki.hlist/minerva.less b/skinStyles/mediawiki.hlist/minerva.less new file mode 100644 index 0000000..c2b9e19 --- /dev/null +++ b/skinStyles/mediawiki.hlist/minerva.less @@ -0,0 +1,32 @@ +// FIXME: to support hlists on enwiki projects - this should be deprecated +.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: ''; + } +} -- To view, visit https://gerrit.wikimedia.org/r/356775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7adda8ef99e5eee3df5bd7dc4da5081c1225f815 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits