From 77c3d99b8f6061e83010dd3dc9e7dd388986f205 Mon Sep 17 00:00:00 2001 From: Volker E Date: Fri, 14 Dec 2018 19:32:41 -0800 Subject: [PATCH] DateTimeInputWidget: Use 'clear' icon to clear input Also removing unnecessary indicator overrides. Bug: T212022 Change-Id: Ie962138811aff03d72ea29eb260131c37067456b --- .../mediawiki.widgets.datetime/DateTimeInputWidget.js | 2 +- .../mediawiki.widgets.datetime/DateTimeInputWidget.less | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js index ef7cea9081..545bf40168 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js @@ -423,7 +423,7 @@ this.clearButton = new OO.ui.ButtonWidget( { classes: [ 'mw-widgets-datetime-dateTimeInputWidget-field', 'mw-widgets-datetime-dateTimeInputWidget-clearButton' ], framed: false, - icon: 'trash', + icon: 'clear', disabled: disabled } ).connect( this, { click: 'onClearClick' diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less index 370a19ff31..2b61b65a52 100644 --- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less +++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less @@ -56,11 +56,6 @@ > .oo-ui-indicatorElement-indicator { right: @padding-horizontal-base; - min-width: @min-size-indicator; - width: @size-indicator; - min-height: @min-size-indicator; - height: @size-indicator; - max-height: @size-base; } } @@ -107,6 +102,10 @@ &-clearButton { padding-top: 0; + + .oo-ui-iconElement-icon { + background-size: @size-indicator @size-indicator; + } } &.oo-ui-widget-enabled { -- 2.20.1