Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366423 )
Change subject: Minerva should use mediawiki.hlist
......................................................................
Minerva should use mediawiki.hlist
Override provided styles
Bug: T42062
Depends-On: I9305af5d30c8c24b44f4a0c6a466581c45fa3028
Change-Id: I7adda8ef99e5eee3df5bd7dc4da5081c1225f815
---
M includes/skins/SkinMinerva.php
M resources/skins.minerva.content.styles/lists.less
M skin.json
A skinStyles/mediawiki.hlist/minerva.less
4 files changed, 46 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/23/366423/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 55b070f..85ed2de 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1352,6 +1352,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..31aff13 100644
--- a/resources/skins.minerva.content.styles/lists.less
+++ b/resources/skins.minerva.content.styles/lists.less
@@ -2,25 +2,8 @@
@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;
- }
-}
+// FIXME: Delete this in 7 days time (T42062)
+@import '../../skinStyles/mediawiki.hlist/minerva.less';
.content {
ul {
@@ -80,15 +63,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/skin.json b/skin.json
index dbf8802..5bb2f25 100644
--- a/skin.json
+++ b/skin.json
@@ -36,6 +36,9 @@
},
"ResourceModuleSkinStyles": {
"minerva": {
+ "mediawiki.hlist": [
+ "skinStyles/mediawiki.hlist/minerva.less"
+ ],
"mobile.languages.structured": [
"skinStyles/mobile.languages.structured/LanguageOverlay.less"
],
diff --git a/skinStyles/mediawiki.hlist/minerva.less
b/skinStyles/mediawiki.hlist/minerva.less
new file mode 100644
index 0000000..80e646a
--- /dev/null
+++ b/skinStyles/mediawiki.hlist/minerva.less
@@ -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: '';
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/366423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7adda8ef99e5eee3df5bd7dc4da5081c1225f815
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
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
