Merge "RCFilters: Fix highlight circle misalignment"

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
index 4a7c3f8..667f528 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
@@ -9,6 +9,15 @@
 
        &-buttonSelect {
                &-color {
+                       // Override OOUI definition from padded popup; the definition
+                       // forces the first-child to be margin-top:0; which overrides
+                       // our definitions below where margin is 0.5em.
+                       // We set up the margin-top as 0.5em for all circles so we get
+                       // a consistent result
+                       &.oo-ui-widget-enabled.oo-ui-optionWidget.oo-ui-buttonElement.oo-ui-buttonElement-frameless.oo-ui-buttonOptionWidget {
+                               margin-top: 0.5em;
+                       }
+
                        // Make the rule much more specific to override OOUI
                        .oo-ui-iconElement-icon.oo-ui-icon-check {
                                // Override OOUI icon dimensions