From: Moriel Schottlender <moriel@gmail.com>
Date: Fri, 18 Aug 2017 23:28:35 +0000 (-0700)
Subject: RCFilters: Fix highlight circle misalignment
X-Git-Tag: 1.31.0-rc.0~2350^2
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=8fd091be675fd9221039073b4791eb0a1b6c42ab;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Fix highlight circle misalignment

Bug: T172820
Change-Id: I44b91529e8edb6a3fcc65ae9159211dbd2d7f4f1
---

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 4a7c3f8895..667f528a30 100644
--- 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