From aa2dced94845cf0c792319d0de05520c5356e773 Mon Sep 17 00:00:00 2001 From: Volker E Date: Mon, 8 Oct 2018 09:16:16 -0700 Subject: [PATCH] RCFilters: Override frameless button opacity to show real highlight color Overriding OOUI's frameless button opacity, which is targeted in this place for icons to show real highlight color. Bug: T190980 Change-Id: Id3355ecad8ff01ef8159375eaa04f7d284fc598b --- .../styles/mw.rcfilters.ui.FilterItemHighlightButton.less | 4 +++- .../styles/mw.rcfilters.ui.HighlightColorPickerWidget.less | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less index 198f599715..dd77eeaa87 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less @@ -2,10 +2,12 @@ .mw-rcfilters-ui-filterItemHighlightButton { .oo-ui-buttonWidget.oo-ui-popupButtonWidget .oo-ui-buttonElement-button > &-circle { + background-image: none; display: inline-block; vertical-align: middle; - background-image: none; margin-right: 0.2em; + // Override OOUI rule on frameless icons + opacity: 1; &-color { &-c1 { 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 ee8ad85818..41dc8cfe5f 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less @@ -29,6 +29,8 @@ height: 1.5em; // By eye, this is centered horizontally for the color circle margin-left: -0.1em; + // Override OOUI rule on frameless icons + opacity: 1; } &-none { @@ -38,8 +40,8 @@ } .mw-rcfilters-mixin-circle( @highlight-none, 2em, 0.5em, true ); - // Override border to dashed - border: 1px dashed @colorGray5; + // Override `border-style` to `dashed` + border-style: dashed; &.oo-ui-buttonOptionWidget.oo-ui-buttonElement-active, &.oo-ui-buttonOptionWidget.oo-ui-optionWidget-pressed, -- 2.20.1