From 2826e4b3f52834c16fc33da8c8cf1be6f1d1de9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 21 Aug 2019 01:02:27 +0200 Subject: [PATCH] mw.widgets.CalendarWidget: Tweak hover styling after OOUI changes Bug: T230393 Change-Id: I9e1e2e3d7dded82e6bc60b00afedef4e56d893b6 --- .../src/mediawiki.widgets/mw.widgets.CalendarWidget.js | 9 +++++++-- .../src/mediawiki.widgets/mw.widgets.CalendarWidget.less | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js index 94aa3b9c5f..997110c786 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js @@ -177,6 +177,7 @@ switch ( this.displayLayer ) { case 'month': this.labelButton.setLabel( this.moment.format( 'MMMM YYYY' ) ); + this.labelButton.toggle( true ); this.upButton.toggle( true ); // First week displayed is the first week spanned by the month, unless it begins on Monday, in @@ -216,6 +217,7 @@ case 'year': this.labelButton.setLabel( this.moment.format( 'YYYY' ) ); + this.labelButton.toggle( true ); this.upButton.toggle( true ); currentMonth = moment( this.moment ).startOf( 'year' ); @@ -248,6 +250,7 @@ case 'duodecade': this.labelButton.setLabel( null ); + this.labelButton.toggle( false ); this.upButton.toggle( false ); currentYear = moment( { year: Math.floor( this.moment.year() / 20 ) * 20 } ); @@ -318,6 +321,8 @@ framed: false, classes: [ 'mw-widget-calendarWidget-labelButton' ] } ); + // FIXME This button is actually not clickable because labelButton covers it, + // should it just be a plain icon? this.upButton = new OO.ui.ButtonWidget( { tabIndex: -1, framed: false, @@ -345,8 +350,8 @@ this.$header.append( this.prevButton.$element, this.nextButton.$element, - this.upButton.$element, - this.labelButton.$element + this.labelButton.$element, + this.upButton.$element ); }; diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less index 7932f735c6..ba5ae33f58 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.less @@ -39,7 +39,9 @@ .mw-widget-calendarWidget-upButton { position: absolute; + top: 0; right: 3em; + pointer-events: none; } .mw-widget-calendarWidget-prevButton { -- 2.20.1