Merge "Fix flaky test BlockListPagerTest::testFormatValue"

[lhc/web/wiklou.git] / resources / src / mediawiki.htmlform.ooui.styles.less

diff --git a/resources/src/mediawiki.htmlform.ooui.styles.less b/resources/src/mediawiki.htmlform.ooui.styles.less
index 3feb9a1..ecf728b 100644 (file)
--- a/resources/src/mediawiki.htmlform.ooui.styles.less
+++ b/resources/src/mediawiki.htmlform.ooui.styles.less
@@ -78,15 +78,24 @@
        }
 }
 
-// Flatlist styling for PHP widgets...
-.mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline,
-// ...and for JS widgets
-.mw-htmlform-flatlist .oo-ui-radioOptionWidget,
-.mw-htmlform-flatlist .oo-ui-checkboxMultioptionWidget {
-       display: inline-block;
-       margin-right: @ooui-spacing-medium;
+// Flatlist styling for PHP (`.oo-ui-fieldLayout-align-inline`) &
+// JS (`.oo-ui-radioOptionWidget, .oo-ui-checkboxMultioptionWidget`) widgets
+.mw-htmlform-flatlist {
+       .oo-ui-fieldLayout-align-inline,
+       .oo-ui-radioOptionWidget,
+       .oo-ui-checkboxMultioptionWidget {
+               display: inline-block;
+               margin-right: @ooui-spacing-medium;
+       }
+
+       // Reduce label distance in flatlist
+       &.oo-ui-fieldLayout.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header {
+               padding-bottom: 0;
+       }
 }
 
+// First selector is flatlist specific
+.mw-htmlform-field-HTMLMultiSelectField.oo-ui-fieldLayout,
 .mw-htmlform-ooui .htmlform-tip,
 .mw-htmlform-ooui .mw-htmlform-submit-buttons {
        margin-top: @ooui-spacing-medium;