jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366892 )
Change subject: mediawiki.hlist: Add sensible defaults
......................................................................
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
---
M resources/Resources.php
A resources/src/mediawiki/mediawiki.hlist-allskins.less
M resources/src/mediawiki/mediawiki.hlist.css
3 files changed, 24 insertions(+), 25 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index 33fb8f1..f725efe 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1060,6 +1060,9 @@
'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 0000000..d7071e4
--- /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 c0788a4..2663d87 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: ':';
--
To view, visit https://gerrit.wikimedia.org/r/366892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61b5f077d8b4a4c7fe845b7b6d1df98bb2dbafc8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
