From 4c30c19d6ba579773dab3b93cd78cd089382d2a5 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 21 Jul 2017 12:00:47 -0700
Subject: [PATCH] mediawiki.hlist: Add sensible defaults

This allows skins to define how hlists appear (e.g. which pseudo
elements to use or whether to use them at all)  while
providing some sensible defaults.

Bug: T42062
Change-Id: I61b5f077d8b4a4c7fe845b7b6d1df98bb2dbafc8
---
 resources/Resources.php                       |  3 +++
 .../mediawiki/mediawiki.hlist-allskins.less   | 21 ++++++++++++++++
 resources/src/mediawiki/mediawiki.hlist.css   | 25 -------------------
 3 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 resources/src/mediawiki/mediawiki.hlist-allskins.less

diff --git a/resources/Resources.php b/resources/Resources.php
index 33fb8f136c..f725efee39 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1060,6 +1060,9 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.hlist' => [
+		'styles' => [
+			'resources/src/mediawiki/mediawiki.hlist-allskins.less',
+		],
 		'skinStyles' => [
 			'default' => 'resources/src/mediawiki/mediawiki.hlist.css',
 		],
diff --git a/resources/src/mediawiki/mediawiki.hlist-allskins.less b/resources/src/mediawiki/mediawiki.hlist-allskins.less
new file mode 100644
index 0000000000..d7071e4515
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.hlist-allskins.less
@@ -0,0 +1,21 @@
+.hlist {
+	dl,
+	ol,
+	ul {
+		margin: 0;
+		padding: 0;
+
+		dl,
+		ol,
+		ul {
+			display: inline;
+		}
+	}
+
+	dd,
+	dt,
+	li {
+		margin: 0;
+		display: inline;
+	}
+}
diff --git a/resources/src/mediawiki/mediawiki.hlist.css b/resources/src/mediawiki/mediawiki.hlist.css
index c0788a4bb2..2663d87370 100644
--- a/resources/src/mediawiki/mediawiki.hlist.css
+++ b/resources/src/mediawiki/mediawiki.hlist.css
@@ -2,31 +2,6 @@
  * Stylesheet for mediawiki.hlist module
  * @author [[User:Edokter]]
  */
-.hlist dl,
-.hlist ol,
-.hlist ul {
-	margin: 0;
-	padding: 0;
-}
-/* Display list items inline */
-.hlist dd,
-.hlist dt,
-.hlist li {
-	margin: 0;
-	display: inline;
-}
-/* Display nested lists inline */
-.hlist dl dl,
-.hlist dl ol,
-.hlist dl ul,
-.hlist ol dl,
-.hlist ol ol,
-.hlist ol ul,
-.hlist ul dl,
-.hlist ul ol,
-.hlist ul ul {
-	display: inline;
-}
 /* Generate interpuncts */
 .hlist dt:after {
 	content: ':';
-- 
2.20.1