From 6cf6b03ba73df166ac4686685319d7a7ef994cb0 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 3 Jan 2017 16:27:21 -0800 Subject: [PATCH] Update OOjs UI to v0.18.3 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.3 Change-Id: I8f26c0024d44dd2bac2c19c869254a7154c4103e --- composer.json | 2 +- resources/lib/oojs-ui/i18n/be.json | 4 +- resources/lib/oojs-ui/i18n/hif-latn.json | 23 ++++ resources/lib/oojs-ui/i18n/tr.json | 6 +- resources/lib/oojs-ui/i18n/tt-cyrl.json | 4 +- resources/lib/oojs-ui/oojs-ui-apex.js | 6 +- resources/lib/oojs-ui/oojs-ui-core-apex.css | 58 ++++++--- .../lib/oojs-ui/oojs-ui-core-mediawiki.css | 117 +++++++++++------- resources/lib/oojs-ui/oojs-ui-core.js | 71 +++++++++-- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 6 +- .../lib/oojs-ui/oojs-ui-toolbars-apex.css | 10 +- .../oojs-ui/oojs-ui-toolbars-mediawiki.css | 10 +- resources/lib/oojs-ui/oojs-ui-toolbars.js | 6 +- .../lib/oojs-ui/oojs-ui-widgets-apex.css | 11 +- .../lib/oojs-ui/oojs-ui-widgets-mediawiki.css | 11 +- resources/lib/oojs-ui/oojs-ui-widgets.js | 20 +-- .../lib/oojs-ui/oojs-ui-windows-apex.css | 6 +- .../lib/oojs-ui/oojs-ui-windows-mediawiki.css | 10 +- resources/lib/oojs-ui/oojs-ui-windows.js | 83 +++++++++++-- .../themes/apex/icons-interactions.json | 2 +- .../oojs-ui/themes/apex/icons-moderation.json | 42 +++++-- ...png => logo-wikimediaDiscovery-invert.png} | Bin ...svg => logo-wikimediaDiscovery-invert.svg} | 0 ...Launch.png => logo-wikimediaDiscovery.png} | Bin ...Launch.svg => logo-wikimediaDiscovery.svg} | 0 .../images/icons/ongoingConversation-ltr.png | Bin 0 -> 257 bytes .../images/icons/ongoingConversation-ltr.svg | 4 + .../images/icons/ongoingConversation-rtl.png | Bin 0 -> 266 bytes .../images/icons/ongoingConversation-rtl.svg | 4 + .../{blockUndo-ltr.png => unBlock-ltr.png} | Bin .../{blockUndo-ltr.svg => unBlock-ltr.svg} | 0 .../{blockUndo-rtl.png => unBlock-rtl.png} | Bin .../{blockUndo-rtl.svg => unBlock-rtl.svg} | 0 .../{flagUndo-ltr.png => unFlag-ltr.png} | Bin .../{flagUndo-ltr.svg => unFlag-ltr.svg} | 0 .../{flagUndo-rtl.png => unFlag-rtl.png} | Bin .../{flagUndo-rtl.svg => unFlag-rtl.svg} | 0 .../{trashUndo-ltr.png => unTrash-ltr.png} | Bin .../{trashUndo-ltr.svg => unTrash-ltr.svg} | 0 .../{trashUndo-rtl.png => unTrash-rtl.png} | Bin .../{trashUndo-rtl.svg => unTrash-rtl.svg} | 0 .../themes/mediawiki/icons-interactions.json | 2 +- .../themes/mediawiki/icons-moderation.json | 44 ++++--- .../themes/mediawiki/icons-wikimedia.json | 1 + ...png => logo-wikimediaDiscovery-invert.png} | Bin ...svg => logo-wikimediaDiscovery-invert.svg} | 0 ...> logo-wikimediaDiscovery-progressive.png} | Bin ...> logo-wikimediaDiscovery-progressive.svg} | 0 ...Launch.png => logo-wikimediaDiscovery.png} | Bin ...Launch.svg => logo-wikimediaDiscovery.svg} | 0 ...-ltr-invert.png => unBlock-ltr-invert.png} | Bin ...-ltr-invert.svg => unBlock-ltr-invert.svg} | 0 ...essive.png => unBlock-ltr-progressive.png} | Bin ...essive.svg => unBlock-ltr-progressive.svg} | 0 .../{blockUndo-ltr.png => unBlock-ltr.png} | Bin .../{blockUndo-ltr.svg => unBlock-ltr.svg} | 0 ...-rtl-invert.png => unBlock-rtl-invert.png} | Bin ...-rtl-invert.svg => unBlock-rtl-invert.svg} | 0 ...essive.png => unBlock-rtl-progressive.png} | Bin ...essive.svg => unBlock-rtl-progressive.svg} | 0 .../{blockUndo-rtl.png => unBlock-rtl.png} | Bin .../{blockUndo-rtl.svg => unBlock-rtl.svg} | 0 ...o-ltr-invert.png => unFlag-ltr-invert.png} | Bin ...o-ltr-invert.svg => unFlag-ltr-invert.svg} | 0 ...ressive.png => unFlag-ltr-progressive.png} | Bin ...ressive.svg => unFlag-ltr-progressive.svg} | 0 .../{flagUndo-ltr.png => unFlag-ltr.png} | Bin .../{flagUndo-ltr.svg => unFlag-ltr.svg} | 0 ...o-rtl-invert.png => unFlag-rtl-invert.png} | Bin ...o-rtl-invert.svg => unFlag-rtl-invert.svg} | 0 ...ressive.png => unFlag-rtl-progressive.png} | Bin ...ressive.svg => unFlag-rtl-progressive.svg} | 0 .../{flagUndo-rtl.png => unFlag-rtl.png} | Bin .../{flagUndo-rtl.svg => unFlag-rtl.svg} | 0 ...-ltr-invert.png => unTrash-ltr-invert.png} | Bin ...-ltr-invert.svg => unTrash-ltr-invert.svg} | 0 ...essive.png => unTrash-ltr-progressive.png} | Bin ...essive.svg => unTrash-ltr-progressive.svg} | 0 .../{trashUndo-ltr.png => unTrash-ltr.png} | Bin .../{trashUndo-ltr.svg => unTrash-ltr.svg} | 0 ...-rtl-invert.png => unTrash-rtl-invert.png} | Bin ...-rtl-invert.svg => unTrash-rtl-invert.svg} | 0 ...essive.png => unTrash-rtl-progressive.png} | Bin ...essive.svg => unTrash-rtl-progressive.svg} | 0 .../{trashUndo-rtl.png => unTrash-rtl.png} | Bin .../{trashUndo-rtl.svg => unTrash-rtl.svg} | 0 86 files changed, 386 insertions(+), 177 deletions(-) create mode 100644 resources/lib/oojs-ui/i18n/hif-latn.json rename resources/lib/oojs-ui/themes/apex/images/icons/{betaLaunch-invert.png => logo-wikimediaDiscovery-invert.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{betaLaunch-invert.svg => logo-wikimediaDiscovery-invert.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{betaLaunch.png => logo-wikimediaDiscovery.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{betaLaunch.svg => logo-wikimediaDiscovery.svg} (100%) create mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png create mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg create mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png create mode 100644 resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg rename resources/lib/oojs-ui/themes/apex/images/icons/{blockUndo-ltr.png => unBlock-ltr.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{blockUndo-ltr.svg => unBlock-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{blockUndo-rtl.png => unBlock-rtl.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{blockUndo-rtl.svg => unBlock-rtl.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{flagUndo-ltr.png => unFlag-ltr.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{flagUndo-ltr.svg => unFlag-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{flagUndo-rtl.png => unFlag-rtl.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{flagUndo-rtl.svg => unFlag-rtl.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{trashUndo-ltr.png => unTrash-ltr.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{trashUndo-ltr.svg => unTrash-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{trashUndo-rtl.png => unTrash-rtl.png} (100%) rename resources/lib/oojs-ui/themes/apex/images/icons/{trashUndo-rtl.svg => unTrash-rtl.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch-invert.png => logo-wikimediaDiscovery-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch-invert.svg => logo-wikimediaDiscovery-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch-progressive.png => logo-wikimediaDiscovery-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch-progressive.svg => logo-wikimediaDiscovery-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch.png => logo-wikimediaDiscovery.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{betaLaunch.svg => logo-wikimediaDiscovery.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr-invert.png => unBlock-ltr-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr-invert.svg => unBlock-ltr-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr-progressive.png => unBlock-ltr-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr-progressive.svg => unBlock-ltr-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr.png => unBlock-ltr.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-ltr.svg => unBlock-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl-invert.png => unBlock-rtl-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl-invert.svg => unBlock-rtl-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl-progressive.png => unBlock-rtl-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl-progressive.svg => unBlock-rtl-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl.png => unBlock-rtl.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{blockUndo-rtl.svg => unBlock-rtl.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr-invert.png => unFlag-ltr-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr-invert.svg => unFlag-ltr-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr-progressive.png => unFlag-ltr-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr-progressive.svg => unFlag-ltr-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr.png => unFlag-ltr.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-ltr.svg => unFlag-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl-invert.png => unFlag-rtl-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl-invert.svg => unFlag-rtl-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl-progressive.png => unFlag-rtl-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl-progressive.svg => unFlag-rtl-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl.png => unFlag-rtl.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{flagUndo-rtl.svg => unFlag-rtl.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr-invert.png => unTrash-ltr-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr-invert.svg => unTrash-ltr-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr-progressive.png => unTrash-ltr-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr-progressive.svg => unTrash-ltr-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr.png => unTrash-ltr.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-ltr.svg => unTrash-ltr.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl-invert.png => unTrash-rtl-invert.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl-invert.svg => unTrash-rtl-invert.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl-progressive.png => unTrash-rtl-progressive.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl-progressive.svg => unTrash-rtl-progressive.svg} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl.png => unTrash-rtl.png} (100%) rename resources/lib/oojs-ui/themes/mediawiki/images/icons/{trashUndo-rtl.svg => unTrash-rtl.svg} (100%) diff --git a/composer.json b/composer.json index 8e98710d12..e103d9c277 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.18.2", + "oojs/oojs-ui": "0.18.3", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/be.json b/resources/lib/oojs-ui/i18n/be.json index 7db7547b59..7b4e54686d 100644 --- a/resources/lib/oojs-ui/i18n/be.json +++ b/resources/lib/oojs-ui/i18n/be.json @@ -3,7 +3,8 @@ "authors": [ "Чаховіч Уладзіслаў", "Artificial123", - "Goshaproject" + "Goshaproject", + "Mechanizatar" ] }, "ooui-outline-control-move-down": "Перамясціць элемент ўніз", @@ -18,6 +19,7 @@ "ooui-dialog-process-dismiss": "Прапусціць", "ooui-dialog-process-retry": "Паспрабаваць яшчэ раз", "ooui-dialog-process-continue": "Працягнуць", + "ooui-selectfile-button-select": "Выбраць файл", "ooui-selectfile-not-supported": "Выбраны файл не падтрымліваецца", "ooui-selectfile-placeholder": "Файл не выбраны" } diff --git a/resources/lib/oojs-ui/i18n/hif-latn.json b/resources/lib/oojs-ui/i18n/hif-latn.json new file mode 100644 index 0000000000..9e903ca5f1 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/hif-latn.json @@ -0,0 +1,23 @@ +{ + "@metadata": { + "authors": [ + "Thakurji" + ] + }, + "ooui-outline-control-move-down": "Item ke niche karo", + "ooui-outline-control-move-up": "Item ke uppar karo", + "ooui-outline-control-remove": "Item ke hatao", + "ooui-toolbar-more": "Aur", + "ooui-toolgroup-expand": "Aur", + "ooui-toolgroup-collapse": "Kamtii", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Cancel karo", + "ooui-dialog-process-error": "Koi chij wrong hoe gais", + "ooui-dialog-process-dismiss": "Dismiss karo", + "ooui-dialog-process-retry": "Fir se try karo", + "ooui-dialog-process-continue": "Continue", + "ooui-selectfile-button-select": "Ek file ke select karo", + "ooui-selectfile-not-supported": "File selection ke support nai karaa jaawe hai", + "ooui-selectfile-placeholder": "Koi file ke nai select karaa gais hai", + "ooui-selectfile-dragdrop-placeholder": "Hian pe file ke girao" +} diff --git a/resources/lib/oojs-ui/i18n/tr.json b/resources/lib/oojs-ui/i18n/tr.json index dbe9f86a8d..9b88695a81 100644 --- a/resources/lib/oojs-ui/i18n/tr.json +++ b/resources/lib/oojs-ui/i18n/tr.json @@ -11,7 +11,8 @@ "Sayginer", "Meelo", "McAang", - "Uğurkent" + "Uğurkent", + "1917 Ekim Devrimi" ] }, "ooui-outline-control-move-down": "Ögeyi aşağı taşı", @@ -28,5 +29,6 @@ "ooui-dialog-process-continue": "Devam et", "ooui-selectfile-button-select": "Dosya seç", "ooui-selectfile-not-supported": "Dosya seçimi desteklenmiyor", - "ooui-selectfile-placeholder": "Herhangi bir dosya seçilmedi" + "ooui-selectfile-placeholder": "Herhangi bir dosya seçilmedi", + "ooui-selectfile-dragdrop-placeholder": "Dosyayı buraya aç" } diff --git a/resources/lib/oojs-ui/i18n/tt-cyrl.json b/resources/lib/oojs-ui/i18n/tt-cyrl.json index 911b6183be..335e509e32 100644 --- a/resources/lib/oojs-ui/i18n/tt-cyrl.json +++ b/resources/lib/oojs-ui/i18n/tt-cyrl.json @@ -18,5 +18,7 @@ "ooui-dialog-process-retry": "Кабатлау", "ooui-dialog-process-continue": "Дәвам итү", "ooui-selectfile-button-select": "Файлны сайлагыз", - "ooui-selectfile-placeholder": "Файл сайланмаган" + "ooui-selectfile-not-supported": "Файл сайлау хупланмый", + "ooui-selectfile-placeholder": "Файл сайланмаган", + "ooui-selectfile-dragdrop-placeholder": "Файлны монда куегыз" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 1acedf2d60..556196cec0 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index 72df673bbf..c36774ace2 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-element-hidden { display: none !important; @@ -231,9 +231,6 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-floatableElement-hidden { - display: none; -} .oo-ui-iconElement .oo-ui-iconElement-icon, .oo-ui-iconElement.oo-ui-iconElement-icon { background-size: contain; @@ -403,6 +400,9 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { white-space: normal; float: left; } +.oo-ui-fieldsetLayout.oo-ui-labelElement > .oo-ui-labelElement-label:empty { + display: none; +} .oo-ui-fieldsetLayout-group { clear: both; } @@ -414,7 +414,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help .oo-ui-fieldsetLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5; + line-height: 1.4; } .oo-ui-fieldsetLayout + .oo-ui-fieldsetLayout, .oo-ui-fieldsetLayout + .oo-ui-formLayout { @@ -449,6 +449,8 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-panelLayout-scrollable { overflow-y: auto; + /* Make scrolling smooth */ + -webkit-transform: translate3d(0, 0, 0); } .oo-ui-panelLayout-expanded { position: absolute; @@ -713,7 +715,6 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { position: relative; } .oo-ui-popupButtonWidget .oo-ui-popupWidget { - position: absolute; cursor: auto; } .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { @@ -1169,9 +1170,9 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { .oo-ui-progressBarWidget-bar { height: 1em; border-right: 1px solid #ccc; - -webkit-transition: width 250ms ease, margin-left 250ms ease; - -moz-transition: width 250ms ease, margin-left 250ms ease; - transition: width 250ms ease, margin-left 250ms ease; + -webkit-transition: width 250ms ease; + -moz-transition: width 250ms ease; + transition: width 250ms ease; background-color: #cde7f4; background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0, #eaf4fa), color-stop(100%, #b0d9ee)); background-image: -webkit-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%); @@ -1184,7 +1185,10 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; animation: oo-ui-progressBarWidget-slide 2s infinite linear; width: 40%; - margin-left: -10%; + -webkit-transform: translate(-25%); + -moz-transform: translate(-25%); + -ms-transform: translate(-25%); + transform: translate(-25%); border-left: 1px solid #a6cee1; } .oo-ui-progressBarWidget.oo-ui-widget-disabled { @@ -1192,25 +1196,43 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } @-webkit-keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } @-moz-keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } @keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index bab34b84d4..68d6413f82 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-element-hidden { display: none !important; @@ -121,39 +121,39 @@ color: #000; box-shadow: none; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { color: #36c; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { color: #447ff5; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active:focus > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active:focus, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #2a4b8d; box-shadow: none; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { color: #36c; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { color: #447ff5; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active:focus > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active:focus, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #2a4b8d; box-shadow: none; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { color: #d33; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { color: #ff4242; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active:focus > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active:focus, +.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #b32424; box-shadow: none; } @@ -248,7 +248,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { background-color: #fff; - border-color: #859dcc; + border-color: #447ff5; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:active:focus, @@ -268,7 +268,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { background-color: #fff; - border-color: #859dcc; + border-color: #447ff5; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:active:focus, @@ -288,7 +288,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { background-color: #fff; - border-color: #b77c79; + border-color: #ff4242; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:active:focus, @@ -378,9 +378,6 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-floatableElement-hidden { - display: none; -} .oo-ui-iconElement .oo-ui-iconElement-icon, .oo-ui-iconElement.oo-ui-iconElement-icon { background-size: contain; @@ -461,6 +458,7 @@ } .oo-ui-fieldLayout.oo-ui-labelElement > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding-bottom: 0.3125em; + line-height: 1.4; } .oo-ui-fieldLayout.oo-ui-labelElement.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label { padding: 0.3125em 0.46875em; @@ -500,7 +498,7 @@ .oo-ui-fieldLayout-messages .oo-ui-labelWidget { display: table-cell; padding: 0.1em 0 0.1em 0.3125em; - line-height: 1.5; + line-height: 1.4; vertical-align: middle; } .oo-ui-actionFieldLayout { @@ -541,6 +539,9 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { white-space: normal; float: left; } +.oo-ui-fieldsetLayout.oo-ui-labelElement > .oo-ui-labelElement-label:empty { + display: none; +} .oo-ui-fieldsetLayout-group { clear: both; } @@ -552,7 +553,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help .oo-ui-fieldsetLayout-help-content { padding: 0.5em 0.75em; - line-height: 1.5; + line-height: 1.4; } .oo-ui-fieldsetLayout + .oo-ui-fieldsetLayout, .oo-ui-fieldsetLayout + .oo-ui-formLayout { @@ -562,6 +563,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { margin-bottom: 0.56818em; font-size: 1.1em; font-weight: bold; + line-height: 1.4; } .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-labelElement-label { padding-left: 2em; @@ -586,6 +588,8 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-panelLayout-scrollable { overflow-y: auto; + /* Make scrolling smooth */ + -webkit-transform: translate3d(0, 0, 0); } .oo-ui-panelLayout-expanded { position: absolute; @@ -642,7 +646,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { overflow: hidden; } .oo-ui-optionWidget .oo-ui-labelElement-label { - line-height: 1.5; + line-height: 1.6; } .oo-ui-optionWidget-selected .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { opacity: 1; @@ -863,7 +867,6 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { position: relative; } .oo-ui-popupButtonWidget .oo-ui-popupWidget { - position: absolute; cursor: auto; } .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { @@ -980,7 +983,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { box-shadow: inset 0 0 0 1px #36c, inset 0 0 0 2px #fff; } .oo-ui-checkboxMultiselectInputWidget .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; } .oo-ui-checkboxMultiselectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body { padding: 0.25em 0; @@ -1136,7 +1139,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { left: -3px; } .oo-ui-radioSelectInputWidget .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; } .oo-ui-radioSelectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body { padding: 0.25em 0; @@ -1251,7 +1254,7 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-textInputWidget.oo-ui-widget-enabled input, .oo-ui-textInputWidget.oo-ui-widget-enabled textarea { - box-shadow: inset 0 0 0 0.1em #fff; + box-shadow: inset 0 0 0 1px #fff; -webkit-transition: border-color 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1); -moz-transition: border-color 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1); transition: border-color 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1); @@ -1298,16 +1301,16 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid input, .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid textarea { - border-color: #f00; + border-color: #d33; } .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid input:hover, .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid textarea:hover { - border-color: #f00; + border-color: #d33; } .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid input:focus, .oo-ui-textInputWidget.oo-ui-widget-enabled.oo-ui-flaggedElement-invalid textarea:focus { - border-color: #f00; - box-shadow: inset 0 0 0 0.1em #f00; + border-color: #d33; + box-shadow: inset 0 0 0 1px #d33; } .oo-ui-textInputWidget.oo-ui-iconElement input, .oo-ui-textInputWidget.oo-ui-iconElement textarea { @@ -1597,9 +1600,6 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { text-overflow: ellipsis; overflow: hidden; } -.oo-ui-multioptionWidget .oo-ui-labelElement-label { - line-height: 1.5; -} .oo-ui-multioptionWidget.oo-ui-widget-disabled { color: #72777d; } @@ -1628,16 +1628,19 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { .oo-ui-progressBarWidget-bar { background-color: #36c; height: 1em; - -webkit-transition: width 200ms, margin-left 200ms; - -moz-transition: width 200ms, margin-left 200ms; - transition: width 200ms, margin-left 200ms; + -webkit-transition: width 200ms; + -moz-transition: width 200ms; + transition: width 200ms; } .oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar { -webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear; -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear; animation: oo-ui-progressBarWidget-slide 2s infinite linear; width: 40%; - margin-left: -10%; + -webkit-transform: translate(-25%); + -moz-transform: translate(-25%); + -ms-transform: translate(-25%); + transform: translate(-25%); border-left-width: 1px; } .oo-ui-progressBarWidget.oo-ui-widget-disabled { @@ -1645,25 +1648,43 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout { } @-webkit-keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } @-moz-keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } @keyframes oo-ui-progressBarWidget-slide { from { - margin-left: -40%; + -webkit-transform: translate(-100%); + -moz-transform: translate(-100%); + -ms-transform: translate(-100%); + transform: translate(-100%); } to { - margin-left: 100%; + -webkit-transform: translate(350%); + -moz-transform: translate(350%); + -ms-transform: translate(350%); + transform: translate(350%); } } diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index b92094c01c..872d81ff64 100644 --- a/resources/lib/oojs-ui/oojs-ui-core.js +++ b/resources/lib/oojs-ui/oojs-ui-core.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { @@ -486,6 +486,22 @@ OO.ui.isSafeUrl = function ( url ) { return false; }; +/** + * Check if the user has a 'mobile' device. + * + * For our purposes this means the user is primarily using an + * on-screen keyboard, touch input instead of a mouse and may + * have a physically small display. + * + * It is left up to implementors to decide how to compute this + * so the default implementation always returns false. + * + * @return {boolean} Use is on a mobile device + */ +OO.ui.isMobile = function () { + return false; +}; + /*! * Mixin namespace. */ @@ -1368,6 +1384,13 @@ OO.ui.Element.prototype.setElementGroup = function ( group ) { * @return {jQuery.Promise} Promise which resolves when the scroll is complete */ OO.ui.Element.prototype.scrollElementIntoView = function ( config ) { + if ( + !this.isElementAttached() || + !this.isVisible() || + ( this.getElementGroup() && !this.getElementGroup().isVisible() ) + ) { + return $.Deferred().resolve(); + } return OO.ui.Element.static.scrollIntoView( this.$element[ 0 ], config ); }; @@ -4103,9 +4126,13 @@ OO.ui.mixin.ClippableElement.prototype.clip = function () { extraHeight = $container.outerHeight() - this.$clippable.outerHeight(); extraWidth = $container.outerWidth() - this.$clippable.outerWidth(); ccOffset = $container.offset(); - $scrollableContainer = this.$clippableScrollableContainer.is( 'html, body' ) ? - this.$clippableWindow : this.$clippableScrollableContainer; - scOffset = $scrollableContainer.offset() || { top: 0, left: 0 }; + if ( this.$clippableScrollableContainer.is( 'html, body' ) ) { + $scrollableContainer = this.$clippableWindow; + scOffset = { top: 0, left: 0 }; + } else { + $scrollableContainer = this.$clippableScrollableContainer; + scOffset = $scrollableContainer.offset(); + } scHeight = $scrollableContainer.innerHeight() - buffer; scWidth = $scrollableContainer.innerWidth() - buffer; ccWidth = $container.outerWidth() + buffer; @@ -7197,10 +7224,10 @@ OO.ui.mixin.FloatableElement.prototype.position = function () { } if ( !this.isElementInViewport( this.$floatableContainer, this.$floatableClosestScrollable ) ) { - this.$floatable.addClass( 'oo-ui-floatableElement-hidden' ); + this.$floatable.addClass( 'oo-ui-element-hidden' ); return; } else { - this.$floatable.removeClass( 'oo-ui-floatableElement-hidden' ); + this.$floatable.removeClass( 'oo-ui-element-hidden' ); } if ( !this.needsCustomPosition ) { @@ -8657,9 +8684,6 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) { blur: this.onBlur.bind( this ), focus: this.onFocus.bind( this ) } ); - this.$input.one( { - focus: this.onElementAttach.bind( this ) - } ); this.$icon.on( 'mousedown', this.onIconMouseDown.bind( this ) ); this.$indicator.on( 'mousedown', this.onIndicatorMouseDown.bind( this ) ); this.on( 'labelChange', this.updatePosition.bind( this ) ); @@ -8704,6 +8728,7 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) { this.$input.attr( 'rows', config.rows ); } if ( this.label || config.autosize ) { + this.isWaitingToBeAttached = true; this.installParentChangeDetector(); } }; @@ -8814,6 +8839,11 @@ OO.ui.TextInputWidget.prototype.onBlur = function () { * @param {jQuery.Event} e Focus event */ OO.ui.TextInputWidget.prototype.onFocus = function () { + if ( this.isWaitingToBeAttached ) { + // If we've received focus, then we must be attached to the document, and if + // isWaitingToBeAttached is still true, that means the handler never fired. Fire it now. + this.onElementAttach(); + } this.setValidityFlag( true ); }; @@ -8824,6 +8854,7 @@ OO.ui.TextInputWidget.prototype.onFocus = function () { * @param {jQuery.Event} e Element attach event */ OO.ui.TextInputWidget.prototype.onElementAttach = function () { + this.isWaitingToBeAttached = false; // Any previously calculated size is now probably invalid if we reattached elsewhere this.valCache = null; this.adjustSize(); @@ -8936,7 +8967,7 @@ OO.ui.TextInputWidget.prototype.installParentChangeDetector = function () { if ( MutationObserver ) { // The new way. If only it wasn't so ugly. - if ( this.$element.closest( 'html' ).length ) { + if ( this.isElementAttached() ) { // Widget is attached already, do nothing. This breaks the functionality of this function when // the widget is detached and reattached. Alas, doing this correctly with MutationObserver // would require observation of the whole document, which would hurt performance of other, @@ -8971,7 +9002,7 @@ OO.ui.TextInputWidget.prototype.installParentChangeDetector = function () { onRemove = function () { // If the node was attached somewhere else, report it - if ( widget.$element.closest( 'html' ).length ) { + if ( widget.isElementAttached() ) { widget.onElementAttach(); } mutationObserver.disconnect(); @@ -9000,6 +9031,11 @@ OO.ui.TextInputWidget.prototype.adjustSize = function () { var scrollHeight, innerHeight, outerHeight, maxInnerHeight, measurementError, idealHeight, newHeight, scrollWidth, property; + if ( this.isWaitingToBeAttached ) { + // #onElementAttach will be called soon, which calls this method + return this; + } + if ( this.multiline && this.$input.val() !== this.valCache ) { if ( this.autosize ) { this.$clone @@ -9386,6 +9422,12 @@ OO.ui.TextInputWidget.prototype.updateSearchIndicator = function () { */ OO.ui.TextInputWidget.prototype.positionLabel = function () { var after, rtl, property; + + if ( this.isWaitingToBeAttached ) { + // #onElementAttach will be called soon, which calls this method + return this; + } + // Clear old values this.$input // Clear old values if present @@ -9578,6 +9620,9 @@ OO.ui.ComboBoxInputWidget = function OoUiComboBoxInputWidget( config ) { autocomplete: false }, config ); + // ComboBoxInputWidget shouldn't support multiline + config.multiline = false; + // Parent constructor OO.ui.ComboBoxInputWidget.parent.call( this, config ); diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 7dc6befecf..c2ea652d1c 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css index baf88332f8..a367301f1a 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { @@ -71,10 +71,6 @@ .oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { color: #000; } -.oo-ui-barToolGroup > .oo-ui-iconElement-icon, -.oo-ui-barToolGroup > .oo-ui-labelElement-label { - display: none; -} .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool { display: inline-block; position: relative; diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css index 99a1f5e563..061082262e 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-tool.oo-ui-widget-enabled { -webkit-transition: background-color 100ms; @@ -64,10 +64,6 @@ .oo-ui-toolbar-narrow .oo-ui-toolGroup + .oo-ui-toolGroup { margin-left: 0; } -.oo-ui-barToolGroup > .oo-ui-iconElement-icon, -.oo-ui-barToolGroup > .oo-ui-labelElement-label { - display: none; -} .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool { display: inline-block; position: relative; diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index e45ca293b0..5280a9f78a 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars.js +++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css index 318bf8296c..941eb3715d 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -219,10 +219,7 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - -webkit-transform: translateZ(0); - -moz-transform: translateZ(0); - -ms-transform: translateZ(0); - transform: translateZ(0); + -webkit-transform: translate3d(0, 0, 0); height: 2em; width: 4em; border-radius: 1em; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index a4db2a3e59..37eee66be0 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -243,10 +243,7 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - -webkit-transform: translateZ(0); - -moz-transform: translateZ(0); - -ms-transform: translateZ(0); - transform: translateZ(0); + -webkit-transform: translate3d(0, 0, 0); background-color: #f8f9fa; width: 3.5em; min-height: 26px; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index 1185fc11e6..d7e92c2606 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets.js +++ b/resources/lib/oojs-ui/oojs-ui-widgets.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { @@ -1642,7 +1642,7 @@ OO.ui.MenuLayout.prototype.getMenuPosition = function () { * @constructor * @param {Object} [config] Configuration options * @cfg {boolean} [continuous=false] Show all pages, one after another - * @cfg {boolean} [autoFocus=true] Focus on the first focusable element when a new page is displayed. + * @cfg {boolean} [autoFocus=true] Focus on the first focusable element when a new page is displayed. Disabled on mobile. * @cfg {boolean} [outlined=false] Show the outline. The outline is used to navigate through the pages of the booklet. * @cfg {boolean} [editable=false] Show controls for adding, removing and reordering pages */ @@ -1781,7 +1781,7 @@ OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) { if ( !this.scrolling && page ) { page.scrollElementIntoView( { complete: function () { - if ( layout.autoFocus ) { + if ( layout.autoFocus && !OO.ui.isMobile() ) { layout.focus(); } } @@ -2112,6 +2112,7 @@ OO.ui.BookletLayout.prototype.setPage = function ( name ) { // meaningless because the next page is not visible yet and thus can't hold focus. if ( this.autoFocus && + !OO.ui.isMobile() && this.stackLayout.continuous && OO.ui.findFocusable( page.$element ).length !== 0 ) { @@ -2188,7 +2189,7 @@ OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () { * @param {Object} [config] Configuration options * @cfg {boolean} [continuous=false] Show all cards, one after another * @cfg {boolean} [expanded=true] Expand the content panel to fill the entire parent element. - * @cfg {boolean} [autoFocus=true] Focus on the first focusable element when a new card is displayed. + * @cfg {boolean} [autoFocus=true] Focus on the first focusable element when a new card is displayed. Disabled on mobile. */ OO.ui.IndexLayout = function OoUiIndexLayout( config ) { // Configuration initialization @@ -2291,7 +2292,7 @@ OO.ui.IndexLayout.prototype.onStackLayoutSet = function ( card ) { if ( card ) { card.scrollElementIntoView( { complete: function () { - if ( layout.autoFocus ) { + if ( layout.autoFocus && !OO.ui.isMobile() ) { layout.focus(); } } @@ -2556,6 +2557,7 @@ OO.ui.IndexLayout.prototype.setCard = function ( name ) { // meaningless because the next card is not visible yet and thus can't hold focus. if ( this.autoFocus && + !OO.ui.isMobile() && this.stackLayout.continuous && OO.ui.findFocusable( card.$element ).length !== 0 ) { @@ -5234,11 +5236,9 @@ OO.ui.NumberInputWidget.prototype.validateNumber = function ( value ) { return false; } - /* eslint-disable no-bitwise */ - if ( this.isInteger && ( n | 0 ) !== n ) { + if ( this.isInteger && Math.floor( n ) !== n ) { return false; } - /* eslint-enable no-bitwise */ if ( n < this.min || n > this.max ) { return false; diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index ad0e7ab76b..ff013a0c79 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index ecc0004ed7..de26ac0873 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:57Z + * Date: 2017-01-04T00:22:45Z */ .oo-ui-window { background: transparent; @@ -123,7 +123,7 @@ } .oo-ui-messageDialog-message-verbose { font-size: 1.1em; - line-height: 1.5; + line-height: 1.4; text-align: left; } .oo-ui-messageDialog-actions-horizontal .oo-ui-actionWidget { @@ -314,7 +314,7 @@ text-align: left; margin: 1em; padding: 1em; - border: 1px solid #ff9e9e; + border: 1px solid #d33; background-color: #fff7f7; border-radius: 2px; } diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index b47b0c814b..be818419a2 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows.js +++ b/resources/lib/oojs-ui/oojs-ui-windows.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.18.2 + * OOjs UI v0.18.3 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2016 OOjs UI Team and other contributors. + * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-12-06T23:32:53Z + * Date: 2017-01-04T00:22:40Z */ ( function ( OO ) { @@ -1987,7 +1987,7 @@ OO.ui.Window.prototype.getReadyProcess = function () { /** * Get the 'hold' process. * - * The hold proccess is used to keep a window from being used in a particular context, + * The hold process is used to keep a window from being used in a particular context, * based on the `data` argument. This method is called during the closing phase of the window’s * lifecycle. * @@ -2881,11 +2881,19 @@ OO.ui.MessageDialog.prototype.setDimensions = function ( dim ) { // Twiddle the overflow property, otherwise an unnecessary scrollbar will be produced. // Need to do it after transition completes (250ms), add 50ms just in case. setTimeout( function () { - var oldOverflow = $scrollable[ 0 ].style.overflow; + var oldOverflow = $scrollable[ 0 ].style.overflow, + activeElement = document.activeElement; + $scrollable[ 0 ].style.overflow = 'hidden'; OO.ui.Element.static.reconsiderScrollbars( $scrollable[ 0 ] ); + // Check reconsiderScrollbars didn't destroy our focus, as we + // are doing this after the ready process. + if ( activeElement && activeElement !== document.activeElement && activeElement.focus ) { + activeElement.focus(); + } + $scrollable[ 0 ].style.overflow = oldOverflow; }, 300 ); @@ -3153,10 +3161,20 @@ OO.ui.ProcessDialog.prototype.initialize = function () { * @inheritdoc */ OO.ui.ProcessDialog.prototype.getActionWidgets = function ( actions ) { - var i, len, widgets = []; + var i, len, config, + isMobile = OO.ui.isMobile(), + widgets = []; + for ( i = 0, len = actions.length; i < len; i++ ) { + config = $.extend( { framed: !OO.ui.isMobile() }, actions[ i ] ); + if ( isMobile && ( config.flags === 'back' || config.flags.indexOf( 'back' ) !== -1 ) ) { + $.extend( config, { + icon: 'previous', + label: '' + } ); + } widgets.push( - new OO.ui.ActionWidget( $.extend( { framed: true }, actions[ i ] ) ) + new OO.ui.ActionWidget( config ) ); } return widgets; @@ -3426,4 +3444,55 @@ OO.ui.confirm = function ( text, options ) { } ); }; +/** + * Display a quick modal prompt dialog, using a OO.ui.MessageDialog. While the dialog is open, + * the rest of the page will be dimmed out and the user won't be able to interact with it. The + * dialog has a text input widget and two action buttons, one to confirm an operation (labelled "OK") + * and one to cancel it (labelled "Cancel"). + * + * A window manager is created automatically when this function is called for the first time. + * + * @example + * OO.ui.prompt( 'Choose a line to go to', { textInput: { placeholder: 'Line number' } } ).done( function ( result ) { + * if ( result !== null ) { + * console.log( 'User typed "' + result + '" then clicked "OK".' ); + * } else { + * console.log( 'User clicked "Cancel" or closed the dialog.' ); + * } + * } ); + * + * @param {jQuery|string} text Message text to display + * @param {Object} [options] Additional options, see OO.ui.MessageDialog#getSetupProcess + * @cfg {Object} [textInput] Additional options for text input widget, see OO.ui.TextInputWidget + * @return {jQuery.Promise} Promise resolved when the user closes the dialog. If the user chose to + * confirm, the promise will resolve with the value of the text input widget; otherwise, it will + * resolve to `null`. + */ +OO.ui.prompt = function ( text, options ) { + var manager = OO.ui.getWindowManager(), + textInput = new OO.ui.TextInputWidget( ( options && options.textInput ) || {} ), + textField = new OO.ui.FieldLayout( textInput, { + align: 'top', + label: text + } ); + + // TODO: This is a little hacky, and could be done by extending MessageDialog instead. + + return manager.openWindow( 'messageDialog', $.extend( { + message: textField.$element, + verbose: true + }, options ) ).then( function ( opened ) { + // After ready + textInput.on( 'enter', function () { + manager.getCurrentWindow().close( { action: 'accept' } ); + } ); + textInput.focus(); + return opened.then( function ( closing ) { + return closing.then( function ( data ) { + return $.Deferred().resolve( data && data.action === 'accept' ? textInput.getValue() : null ); + } ); + } ); + } ); +}; + }( OO ) ); diff --git a/resources/lib/oojs-ui/themes/apex/icons-interactions.json b/resources/lib/oojs-ui/themes/apex/icons-interactions.json index 02dfffa895..449cb77667 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-interactions.json +++ b/resources/lib/oojs-ui/themes/apex/icons-interactions.json @@ -9,7 +9,7 @@ }, "images": { "beta": { "file": "images/icons/beta.svg" }, - "betaLaunch": { "file": "images/icons/betaLaunch.svg" }, + "betaLaunch": { "file": "images/icons/logo-wikimediaDiscovery.svg" }, "bookmark": { "file": { "ltr": "images/icons/bookmark-ltr.svg", "rtl": "images/icons/bookmark-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/apex/icons-moderation.json b/resources/lib/oojs-ui/themes/apex/icons-moderation.json index f904cc26d9..b5dff27496 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-moderation.json +++ b/resources/lib/oojs-ui/themes/apex/icons-moderation.json @@ -4,30 +4,46 @@ "images": { "block": { "file": "images/icons/block.svg" }, "blockUndo": { "file": { - "ltr": "images/icons/blockUndo-ltr.svg", - "rtl": "images/icons/blockUndo-rtl.svg" + "ltr": "images/icons/unBlock-ltr.svg", + "rtl": "images/icons/unBlock-rtl.svg" + } }, + "unBlock": { "file": { + "ltr": "images/icons/unBlock-ltr.svg", + "rtl": "images/icons/unBlock-rtl.svg" } }, "flag": { "file": { "ltr": "images/icons/flag-ltr.svg", "rtl": "images/icons/flag-rtl.svg" } }, "flagUndo": { "file": { - "ltr": "images/icons/flagUndo-ltr.svg", - "rtl": "images/icons/flagUndo-rtl.svg" + "ltr": "images/icons/unFlag-ltr.svg", + "rtl": "images/icons/unFlag-rtl.svg" } }, - "lock": { "file": "images/icons/lock.svg" }, - "star": { "file": "images/icons/star.svg" }, - "trash": { "file": "images/icons/trash.svg" }, - "trashUndo": { "file": { - "ltr": "images/icons/trashUndo-ltr.svg", - "rtl": "images/icons/trashUndo-rtl.svg" + "unFlag": { "file": { + "ltr": "images/icons/unFlag-ltr.svg", + "rtl": "images/icons/unFlag-rtl.svg" } }, + "lock": { "file": "images/icons/lock.svg" }, "unLock": { "file": { "ltr": "images/icons/unLock-ltr.svg", "rtl": "images/icons/unLock-rtl.svg" } }, - "unStar": { "file": "images/icons/unStar.svg" } - - + "star": { "file": "images/icons/star.svg" }, + "unStar": { "file": "images/icons/unStar.svg" }, + "trash": { "file": "images/icons/trash.svg" }, + "unTrash": { "file": { + "ltr": "images/icons/unTrash-ltr.svg", + "rtl": "images/icons/unTrash-rtl.svg" + } }, + "trashUndo": { "file": { + "ltr": "images/icons/unTrash-ltr.svg", + "rtl": "images/icons/unTrash-rtl.svg" + } }, + "ongoingConversation": { + "file": { + "ltr": "images/icons/ongoingConversation-ltr.svg", + "rtl": "images/icons/ongoingConversation-rtl.svg" + } + } } } diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch-invert.png b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch-invert.png rename to resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch-invert.svg b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch-invert.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch.png b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch.png rename to resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch.svg b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/betaLaunch.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.png new file mode 100644 index 0000000000000000000000000000000000000000..df49095bd4a3731903871b7b07f567d9e27def5c GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#b!?z z#}JRsx0emOm>dOKAD%xNU~uz501t1=T_67^^BfEU1%#bH+cvQq#2QStY-nVAHk?mob{@R$djW&ADh!9#D1OFefiLXue@b1l4reOW}Bg6bxdNh z%DFR@zUhv6t(6Oub(sD>KQwDvzC`H-Ctlu~N7AAu8{KbbZdzZh*74-W#a-XaCMQ+D z{q(%^TyjnTFZZ;j9er_H)2B*g|9SMk@jL7LGlHGWZpXDFJ}U#A&*16m=d#Wzp$Py) CzGg@O literal 0 HcmV?d00001 diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg new file mode 100644 index 0000000000..658809d89b --- /dev/null +++ b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-ltr.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7e9bda3ff559e7f763160ba72f644d378fa265 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#U4)= z#}JRsx0h|Zm>fk|9-N;az|#MKQ;b#E*xcjYho^O^54a>ewW4h z1%Af9JiK2fn}rto%=i+?DsjY>+c3_Vzx1Y(OhQ|5+h)ssqW?P+U5@!CX37Em!QkoY K=d#Wzp$Pzz7-QoA literal 0 HcmV?d00001 diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg new file mode 100644 index 0000000000..648ce55a14 --- /dev/null +++ b/resources/lib/oojs-ui/themes/apex/images/icons/ongoingConversation-rtl.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unBlock-ltr.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unBlock-rtl.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unFlag-ltr.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unFlag-rtl.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-ltr.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-ltr.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unTrash-ltr.svg diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-rtl.png rename to resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.png diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/apex/images/icons/trashUndo-rtl.svg rename to resources/lib/oojs-ui/themes/apex/images/icons/unTrash-rtl.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json b/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json index f110a0462a..e040ffba71 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json @@ -23,7 +23,7 @@ }, "images": { "beta": { "file": "images/icons/beta.svg" }, - "betaLaunch": { "file": "images/icons/betaLaunch.svg" }, + "betaLaunch": { "file": "images/icons/logo-wikimediaDiscovery.svg" }, "bookmark": { "file": { "ltr": "images/icons/bookmark-ltr.svg", "rtl": "images/icons/bookmark-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json index 3779ae3fc0..9cc0f321cf 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json @@ -24,38 +24,50 @@ "images": { "block": { "file": "images/icons/block.svg", "variants": [ "destructive" ] }, "blockUndo": { "file": { - "ltr": "images/icons/blockUndo-ltr.svg", - "rtl": "images/icons/blockUndo-rtl.svg" + "ltr": "images/icons/unBlock-ltr.svg", + "rtl": "images/icons/unBlock-rtl.svg" + } }, + "unBlock": { "file": { + "ltr": "images/icons/unBlock-ltr.svg", + "rtl": "images/icons/unBlock-rtl.svg" } }, "flag": { "file": { "ltr": "images/icons/flag-ltr.svg", "rtl": "images/icons/flag-rtl.svg" } }, + "unFlag": { "file": { + "ltr": "images/icons/unFlag-ltr.svg", + "rtl": "images/icons/unFlag-rtl.svg" + } }, "flagUndo": { "file": { - "ltr": "images/icons/flagUndo-ltr.svg", - "rtl": "images/icons/flagUndo-rtl.svg" + "ltr": "images/icons/unFlag-ltr.svg", + "rtl": "images/icons/unFlag-rtl.svg" } }, "lock": { "file": { "ltr": "images/icons/lock-ltr.svg", "rtl": "images/icons/lock-rtl.svg" }, "variants": [ "destructive" ] }, + "unLock": { "file": { + "ltr": "images/icons/unLock-ltr.svg", + "rtl": "images/icons/unLock-rtl.svg" + }, "variants": [ "destructive" ] }, + "star": { "file": "images/icons/star.svg", "variants": [ "constructive", "progressive" ] }, + "unStar": { "file": "images/icons/unStar.svg", "variants": [ "constructive", "progressive" ] }, + "trash": { "file": "images/icons/trash.svg" }, + "unTrash": { "file": { + "ltr": "images/icons/unTrash-ltr.svg", + "rtl": "images/icons/unTrash-rtl.svg" + } }, + "trashUndo": { "file": { + "ltr": "images/icons/unTrash-ltr.svg", + "rtl": "images/icons/unTrash-rtl.svg" + } }, "ongoingConversation": { "file": { "ltr": "images/icons/ongoingConversation-ltr.svg", "rtl": "images/icons/ongoingConversation-rtl.svg" }, "variants": [ "progressive" ] - }, - "star": { "file": "images/icons/star.svg", "variants": [ "constructive", "progressive" ] }, - "trash": { "file": "images/icons/trash.svg" }, - "trashUndo": { "file": { - "ltr": "images/icons/trashUndo-ltr.svg", - "rtl": "images/icons/trashUndo-rtl.svg" - } }, - "unLock": { "file": { - "ltr": "images/icons/unLock-ltr.svg", - "rtl": "images/icons/unLock-rtl.svg" - }, "variants": [ "destructive" ] }, - "unStar": { "file": "images/icons/unStar.svg", "variants": [ "constructive", "progressive" ] } + } } } diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json b/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json index 61aec85d21..14f6b18681 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json @@ -24,6 +24,7 @@ "images": { "logoCC": { "file": "images/icons/logo-cc.svg" }, "logoWikimediaCommons": { "file": "images/icons/logo-wikimediaCommons.svg" }, + "logoWikimediaDiscovery": { "file": "images/icons/logo-wikimediaDiscovery.svg" }, "logoWikipedia": { "file": "images/icons/logo-wikipedia.svg" } } } diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/logo-wikimediaDiscovery.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-ltr.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unBlock-rtl.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-ltr.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-ltr.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/flagUndo-rtl.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unFlag-rtl.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-ltr.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-ltr.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-invert.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-invert.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-invert.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-invert.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-invert.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-invert.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-progressive.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-progressive.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-progressive.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-progressive.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl-progressive.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl-progressive.svg diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl.png similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl.png rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl.png diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl.svg similarity index 100% rename from resources/lib/oojs-ui/themes/mediawiki/images/icons/trashUndo-rtl.svg rename to resources/lib/oojs-ui/themes/mediawiki/images/icons/unTrash-rtl.svg -- 2.20.1