Merge "RCFilters: Don't let new params filter out old page"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / styles / mw.rcfilters.ui.HighlightColorPickerWidget.less

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 88f1195..ee8ad85 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.ui/variables';
 @import 'mw.rcfilters.mixins';
 
 .mw-rcfilters-ui-highlightColorPickerWidget {
@@ -9,15 +10,36 @@
 
        &-buttonSelect {
                &-color {
-                       .oo-ui-iconElement-icon {
-                               width: 2em;
-                               height: 2em;
+                       // 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
+                               // The parent is 2em with 0.5em margin
+                               // (see mw-rcfilters-mixin-circle below)
+                               // so here we want 2em - 0.5em = 1.5em
+                               width: 1.5em;
+                               height: 1.5em;
+                               // By eye, this is centered horizontally for the color circle
+                               margin-left: -0.1em;
                        }
 
                        &-none {
+                               .oo-ui-iconElement-icon.oo-ui-icon-check {
+                                       // By eye, this is centered horizontally for the white circle
+                                       margin-left: -0.2em;
+                               }
+
                                .mw-rcfilters-mixin-circle( @highlight-none, 2em, 0.5em, true );
                                // Override border to dashed
-                               border: 1px dashed #565656;
+                               border: 1px dashed @colorGray5;
 
                                &.oo-ui-buttonOptionWidget.oo-ui-buttonElement-active,
                                &.oo-ui-buttonOptionWidget.oo-ui-optionWidget-pressed,