Merge "HTMLMultiSelectField: Fix OOUI\CheckboxMultiselectInputWidget to be infusable...

diff --git a/includes/htmlform/fields/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php
index 77ea7cd..c98e1ec 100644 (file)
--- a/includes/htmlform/fields/HTMLRadioField.php
+++ b/includes/htmlform/fields/HTMLRadioField.php
@@ -72,10 +72,6 @@ class HTMLRadioField extends HTMLFormField {
                ) );
        }
 
-       protected function shouldInfuseOOUI() {
-               return true;
-       }
-
        public function formatOptions( $options, $value ) {
                global $wgUseMediaWikiUIEverywhere;
 

diff --git a/resources/src/mediawiki/htmlform/ooui.styles.less b/resources/src/mediawiki/htmlform/ooui.styles.less
index 1607489..e78a4ca 100644 (file)
--- a/resources/src/mediawiki/htmlform/ooui.styles.less
+++ b/resources/src/mediawiki/htmlform/ooui.styles.less
@@ -1,4 +1,4 @@
-/* OOUIHTMLForm styles */
+// OOUIHTMLForm styles
 .mw-htmlform-ooui-wrapper.oo-ui-panelLayout-padded {
        padding: 1em 1.25em 1.25em;
 }
@@ -43,9 +43,14 @@
        }
 }
 
-/* Flatlist styling for PHP widgets... */
+// HACK: Hide empty fieldsetLayoutHeaders, until T180535 isn't resolved
+.oo-ui-fieldsetLayout:not( .oo-ui-labelElement ):not( .oo-ui-iconElement ) > .oo-ui-fieldsetLayout-header {
+       display: none;
+}
+
+// Flatlist styling for PHP widgets...
 .mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline,
-/* ...and for JS widgets */
+// ...and for JS widgets
 .mw-htmlform-flatlist .oo-ui-radioOptionWidget,
 .mw-htmlform-flatlist .oo-ui-checkboxMultioptionWidget {
        display: inline-block;

diff --git a/resources/src/mediawiki/mediawiki.diff.styles.css b/resources/src/mediawiki/mediawiki.diff.styles.css
index 1f6e54c..7260a0a 100644 (file)
--- a/resources/src/mediawiki/mediawiki.diff.styles.css
+++ b/resources/src/mediawiki/mediawiki.diff.styles.css
@@ -137,6 +137,7 @@ td.diff-marker {
 .mw-diff-movedpara-left:hover,
 .mw-diff-movedpara-right:hover {
        text-decoration: none;
+       color: transparent;
 }
 
 .mw-diff-movedpara-left:after,