Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/276003
Change subject: Update OOjs UI to v0.16.2 ...................................................................... Update OOjs UI to v0.16.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.16.2/History.md Change-Id: I5c7402606bbc5ea1c20548b7eae657338b4ae151 --- M composer.json A resources/lib/oojs-ui/i18n/mn.json M resources/lib/oojs-ui/i18n/ug-arab.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json M resources/lib/oojs-ui/themes/apex/icons-editing-core.json M resources/lib/oojs-ui/themes/apex/icons-editing-styling.json A resources/lib/oojs-ui/themes/apex/images/icons/markup.png A resources/lib/oojs-ui/themes/apex/images/icons/markup.svg M resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json M resources/lib/oojs-ui/themes/mediawiki/icons-layout.json M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json M resources/lib/oojs-ui/themes/mediawiki/icons.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.svg 56 files changed, 261 insertions(+), 141 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/276003/1 diff --git a/composer.json b/composer.json index a545bb1..cf012a4 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.16.1", + "oojs/oojs-ui": "0.16.2", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/mn.json b/resources/lib/oojs-ui/i18n/mn.json new file mode 100644 index 0000000..500aca7 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/mn.json @@ -0,0 +1,20 @@ +{ + "@metadata": { + "authors": [ + "Munkhzaya.E" + ] + }, + "ooui-toolbar-more": "Илүү", + "ooui-toolgroup-expand": "Илүү", + "ooui-toolgroup-collapse": "Цөөн", + "ooui-dialog-message-accept": "За", + "ooui-dialog-message-reject": "Цуцлах", + "ooui-dialog-process-error": "Ямар нэг алдаа гарсан", + "ooui-dialog-process-dismiss": "Нуух", + "ooui-dialog-process-retry": "Дахин оролдох", + "ooui-dialog-process-continue": "Цааш явах", + "ooui-selectfile-button-select": "Файлаа сонгох", + "ooui-selectfile-not-supported": "Сонгосол файл нь дэмжигдэхгүй байна", + "ooui-selectfile-placeholder": "Файл сонгоогүй байна", + "ooui-selectfile-dragdrop-placeholder": "Файлаа энд хадгалах" +} diff --git a/resources/lib/oojs-ui/i18n/ug-arab.json b/resources/lib/oojs-ui/i18n/ug-arab.json index 19725cc..00d1961 100644 --- a/resources/lib/oojs-ui/i18n/ug-arab.json +++ b/resources/lib/oojs-ui/i18n/ug-arab.json @@ -5,5 +5,21 @@ "Tel'et", "Tifinaghes" ] - } + }, + "ooui-outline-control-move-down": "تۆۋەنگە يۆتكە", + "ooui-outline-control-move-up": "يۇقۇرىغا يۆتكە", + "ooui-outline-control-remove": "ئۆچۈر", + "ooui-toolbar-more": "تېخىمۇ كۆپ", + "ooui-toolgroup-expand": "تېخىمۇ كۆپ", + "ooui-toolgroup-collapse": "ئاز", + "ooui-dialog-message-accept": "تامام", + "ooui-dialog-message-reject": "ۋاز كەچ", + "ooui-dialog-process-error": "نامەلۇم خاتالىق كۆرۈلدى", + "ooui-dialog-process-dismiss": "چىقىرىۋەت", + "ooui-dialog-process-retry": "قايتا سىنا", + "ooui-dialog-process-continue": "داۋاملاشتۇر", + "ooui-selectfile-button-select": "بىر ھۆججەت تاللا", + "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 d07bcf2..d297933 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( 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 5bd560a..8b92d89 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-element-hidden { display: none !important; @@ -31,7 +31,8 @@ cursor: default; } .oo-ui-buttonElement.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, -.oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, +.oo-ui-buttonElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { display: inline-block; vertical-align: middle; } @@ -39,18 +40,9 @@ display: inline-block; position: relative; } -.oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - display: inline-block; - vertical-align: middle; -} .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button { - display: inline-block; vertical-align: top; text-align: center; -} -.oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - display: inline-block; - vertical-align: middle; } .oo-ui-buttonElement-framed.oo-ui-widget-disabled > .oo-ui-buttonElement-button, .oo-ui-buttonElement-framed.oo-ui-widget-disabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, @@ -806,12 +798,9 @@ overflow: auto; } .oo-ui-textInputWidget input[type="search"] { - -webkit-appearance: none; + -webkit-appearance: texfield; } .oo-ui-textInputWidget input[type="search"]::-ms-clear { - display: none; -} -.oo-ui-textInputWidget input[type="search"]::-ms-reveal { display: none; } .oo-ui-textInputWidget input[type="search"]::-webkit-search-decoration, diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index dfb34b3..6ff352c 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-element-hidden { display: none !important; @@ -31,7 +31,8 @@ cursor: default; } .oo-ui-buttonElement.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, -.oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, +.oo-ui-buttonElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { display: inline-block; vertical-align: middle; } @@ -39,18 +40,9 @@ display: inline-block; position: relative; } -.oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - display: inline-block; - vertical-align: middle; -} .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button { - display: inline-block; vertical-align: top; text-align: center; -} -.oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - display: inline-block; - vertical-align: middle; } .oo-ui-buttonElement-framed.oo-ui-widget-disabled > .oo-ui-buttonElement-button, .oo-ui-buttonElement-framed.oo-ui-widget-disabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, @@ -113,14 +105,14 @@ } .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:focus > .oo-ui-labelElement-label { - color: #008064; + color: #2962cc; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - color: #00af89; + color: #347bff; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - color: #005946; + color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, @@ -166,7 +158,6 @@ .oo-ui-buttonElement-framed > input.oo-ui-buttonElement-button, .oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { line-height: 1.2em; - display: inline-block; } .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { position: absolute; @@ -175,9 +166,6 @@ } .oo-ui-buttonElement-framed.oo-ui-iconElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { margin-left: 0.3em; -} -.oo-ui-buttonElement-framed.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { - display: inline-block; } .oo-ui-buttonElement-framed.oo-ui-indicatorElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, .oo-ui-buttonElement-framed.oo-ui-indicatorElement.oo-ui-iconElement:not( .oo-ui-labelElement ) > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { @@ -236,20 +224,20 @@ color: #ffffff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { - color: #00af89; + color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { - background-color: rgba(0, 171, 137, 0.1); - border-color: rgba(0, 89, 70, 0.5); + background-color: rgba(52, 123, 255, 0.1); + border-color: rgba(31, 73, 153, 0.5); } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #005946; - border-color: #005946; + box-shadow: inset 0 0 0 1px #1f4999; + border-color: #1f4999; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { - color: #005946; - border-color: #005946; + color: #1f4999; + border-color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -303,22 +291,22 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { color: #ffffff; - background-color: #00af89; - border-color: #00af89; + background-color: #347bff; + border-color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { - background: #008064; - border-color: #008064; + background: #2962cc; + border-color: #2962cc; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus { box-shadow: inset 0 0 0 1px #ffffff; - border-color: #00af89; + border-color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #ffffff; - background-color: #005946; - border-color: #005946; + background-color: #1f4999; + border-color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -864,10 +852,10 @@ height: 1.6em; background-color: white; border: 1px solid #777777; - background-image: url("themes/mediawiki/images/icons/check-constructive.png"); - background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check-constructive.svg"); - background-image: linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check-constructive.svg"); - background-image: -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/check-constructive.png"); + background-image: url("themes/mediawiki/images/icons/check-constructive-deprecated.png"); + background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check-constructive-deprecated.svg"); + background-image: linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check-constructive-deprecated.svg"); + background-image: -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/check-constructive-deprecated.png"); background-repeat: no-repeat; background-position: center center; background-origin: border-box; @@ -982,10 +970,10 @@ height: 1.6em; background: white; border: 1px solid #777777; - background-image: url("themes/mediawiki/images/icons/circle-constructive.png"); - background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/circle-constructive.svg"); - background-image: linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/circle-constructive.svg"); - background-image: -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/circle-constructive.png"); + background-image: url("themes/mediawiki/images/icons/circle-constructive-deprecated.png"); + background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/circle-constructive-deprecated.svg"); + background-image: linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/circle-constructive-deprecated.svg"); + background-image: -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/circle-constructive-deprecated.png"); background-repeat: no-repeat; background-position: center center; background-origin: border-box; @@ -1043,12 +1031,9 @@ overflow: auto; } .oo-ui-textInputWidget input[type="search"] { - -webkit-appearance: none; + -webkit-appearance: texfield; } .oo-ui-textInputWidget input[type="search"]::-ms-clear { - display: none; -} -.oo-ui-textInputWidget input[type="search"]::-ms-reveal { display: none; } .oo-ui-textInputWidget input[type="search"]::-webkit-search-decoration, @@ -1297,7 +1282,6 @@ left: 0.25em; } .oo-ui-dropdownWidget-handle .oo-ui-labelElement-label { - line-height: 1.275em; margin: 0 1em; } .oo-ui-dropdownWidget-handle .oo-ui-indicatorElement-indicator { diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index 9be8e3a..f587a39 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( function ( OO ) { @@ -7020,7 +7020,7 @@ * @cfg {boolean} [useInputTag=false] Use an `<input/>` tag instead of a `<button/>` tag, the default. * Widgets configured to be an `<input/>` do not support {@link #icon icons} and {@link #indicator indicators}, * non-plaintext {@link #label labels}, or {@link #value values}. In general, useInputTag should only - * be set to `true` when there’s need to support IE6 in a form with multiple buttons. + * be set to `true` when there’s need to support IE 6 in a form with multiple buttons. */ OO.ui.ButtonInputWidget = function OoUiButtonInputWidget( config ) { // Configuration initialization @@ -7705,7 +7705,7 @@ * @constructor * @param {Object} [config] Configuration options * @cfg {string} [type='text'] The value of the HTML `type` attribute: 'text', 'password', 'search', - * 'email' or 'url'. Ignored if `multiline` is true. + * 'email', 'url' or 'date'. Ignored if `multiline` is true. * * Some values of `type` result in additional behaviors: * @@ -8106,8 +8106,8 @@ .val( '' ); maxInnerHeight = this.$clone.innerHeight(); - // Difference between reported innerHeight and scrollHeight with no scrollbars present - // Equals 1 on Blink-based browsers and 0 everywhere else + // Difference between reported innerHeight and scrollHeight with no scrollbars present. + // This is sometimes non-zero on Blink-based browsers, depending on zoom level. measurementError = maxInnerHeight - this.$clone[ 0 ].scrollHeight; idealHeight = Math.min( maxInnerHeight, scrollHeight + measurementError ); @@ -8161,7 +8161,7 @@ * @private */ OO.ui.TextInputWidget.prototype.getSaneType = function ( config ) { - var type = [ 'text', 'password', 'search', 'email', 'url' ].indexOf( config.type ) !== -1 ? + var type = [ 'text', 'password', 'search', 'email', 'url', 'date' ].indexOf( config.type ) !== -1 ? config.type : 'text'; return config.multiline ? 'multiline' : type; @@ -8204,7 +8204,16 @@ this.focus(); - input.setSelectionRange( start, end, isBackwards ? 'backward' : 'forward' ); + try { + input.setSelectionRange( start, end, isBackwards ? 'backward' : 'forward' ); + } catch ( e ) { + // IE throws an exception if you call setSelectionRange on a unattached DOM node. + // Rather than expensively check if the input is attached every time, just check + // if it was the cause of an error being thrown. If not, rethrow the error. + if ( this.getElementDocument().body.contains( input ) ) { + throw e; + } + } return this; }; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 453bebe..c2bf522 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( 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 f246a93..0ea3006 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css index e11849e..90b7f83 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index dfdabc9..6fddd25 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( 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 045f55d..2d60c08 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css @@ -1,31 +1,36 @@ /*! - * OOjs UI v0.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ -.oo-ui-draggableElement-handle.oo-ui-widget-enabled { +.oo-ui-draggableElement-handle, +.oo-ui-draggableElement-handle.oo-ui-widget { cursor: move; cursor: url(images/grab.cur ); cursor: -webkit-grab; cursor: -moz-grab; cursor: grab; } -.oo-ui-draggableElement-placeholder { - opacity: 0.2; -} -.oo-ui-draggableElement.oo-ui-widget-enabled:active { +.oo-ui-draggableElement-handle:active { cursor: move; cursor: url(images/grabbing.cur ); cursor: -webkit-grabbing; cursor: -moz-grabbing; cursor: grabbing; } -.oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement.oo-ui-optionWidget { +.oo-ui-draggableElement-handle.oo-ui-widget-disabled, +.oo-ui-widget-disabled .oo-ui-draggableElement-handle { + cursor: default; +} +.oo-ui-draggableElement-placeholder { + opacity: 0.2; +} +.oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement { display: inline-block; } .oo-ui-lookupElement > .oo-ui-menuSelectWidget { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index 5726dae..165a6c2 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css @@ -1,31 +1,36 @@ /*! - * OOjs UI v0.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ -.oo-ui-draggableElement-handle.oo-ui-widget-enabled { +.oo-ui-draggableElement-handle, +.oo-ui-draggableElement-handle.oo-ui-widget { cursor: move; cursor: url(images/grab.cur ); cursor: -webkit-grab; cursor: -moz-grab; cursor: grab; } -.oo-ui-draggableElement-placeholder { - opacity: 0.2; -} -.oo-ui-draggableElement.oo-ui-widget-enabled:active { +.oo-ui-draggableElement-handle:active { cursor: move; cursor: url(images/grabbing.cur ); cursor: -webkit-grabbing; cursor: -moz-grabbing; cursor: grabbing; } -.oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement.oo-ui-optionWidget { +.oo-ui-draggableElement-handle.oo-ui-widget-disabled, +.oo-ui-widget-disabled .oo-ui-draggableElement-handle { + cursor: default; +} +.oo-ui-draggableElement-placeholder { + opacity: 0.2; +} +.oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement { display: inline-block; } .oo-ui-lookupElement > .oo-ui-menuSelectWidget { @@ -628,7 +633,7 @@ right: 2em; } .oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-dropTarget { - background: rgba(52, 123, 255, 0.1); + background-color: rgba(52, 123, 255, 0.1); } .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index ac4b5b4..04137da 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( function ( OO ) { @@ -3720,6 +3720,13 @@ * @param {Mixed[]} datas Data of the now-selected items */ +/** + * @event resize + * + * A resize event is emitted when the widget's dimensions change to accomodate newly added items or + * current user input. + */ + /* Methods */ /** @@ -3882,7 +3889,7 @@ } if ( !same ) { this.emit( 'change', this.getItemsData() ); - this.menu.position(); + this.updateIfHeightChanged(); } return this; @@ -3919,7 +3926,7 @@ } if ( !same ) { this.emit( 'change', this.getItemsData() ); - this.menu.position(); + this.updateIfHeightChanged(); } return this; @@ -3932,7 +3939,7 @@ if ( this.items.length ) { OO.ui.mixin.GroupElement.prototype.clearItems.call( this ); this.emit( 'change', this.getItemsData() ); - this.menu.position(); + this.updateIfHeightChanged(); } return this; }; @@ -4162,8 +4169,21 @@ bestWidth = this.$content.innerWidth() - 10; } this.$input.width( Math.floor( bestWidth ) ); + this.updateIfHeightChanged(); + } +}; +/** + * Determine if widget height changed, and if so, update menu position and emit 'resize' event. + * + * @private + */ +OO.ui.CapsuleMultiSelectWidget.prototype.updateIfHeightChanged = function () { + var height = this.$element.height(); + if ( height !== this.height ) { + this.height = height; this.menu.position(); + this.emit( 'resize' ); } }; diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index d54017c..68659d3 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); @@ -153,7 +153,6 @@ .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-labelElement .oo-ui-labelElement-label { text-align: center; line-height: 3.4em; - padding: 0 2em; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:hover { background-color: rgba(0, 0, 0, 0.05); diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index c2b44b4..e1e5b51 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:17Z + * Date: 2016-03-08T21:46:53Z */ .oo-ui-window { background: transparent; @@ -146,7 +146,6 @@ .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-labelElement .oo-ui-labelElement-label { text-align: center; line-height: 3.4em; - padding: 0 2em; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:hover { background-color: rgba(0, 0, 0, 0.05); @@ -164,10 +163,10 @@ font-weight: bold; } .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-flaggedElement-constructive:hover { - background-color: rgba(118, 171, 54, 0.05); + background-color: rgba(8, 126, 204, 0.05); } .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-flaggedElement-constructive:active { - background-color: rgba(118, 171, 54, 0.1); + background-color: rgba(8, 126, 204, 0.1); } .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-flaggedElement-destructive:hover { background-color: rgba(212, 83, 83, 0.05); diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index f07f11e..dbd50ed 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.16.1 + * OOjs UI v0.16.2 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-03-01T21:50:12Z + * Date: 2016-03-08T21:46:49Z */ ( function ( OO ) { @@ -2417,10 +2417,18 @@ * @param {jQuery.Event} e Key down event */ OO.ui.Dialog.prototype.onDialogKeyDown = function ( e ) { - if ( e.which === OO.ui.Keys.ESCAPE ) { + var actions; + if ( e.which === OO.ui.Keys.ESCAPE && this.constructor.static.escapable ) { this.executeAction( '' ); e.preventDefault(); e.stopPropagation(); + } else if ( e.which === OO.ui.Keys.ENTER && e.ctrlKey ) { + actions = this.actions.get( { flags: 'primary', visible: true, disabled: false } ); + if ( actions.length > 0 ) { + this.executeAction( actions[ 0 ].getAction() ); + e.preventDefault(); + e.stopPropagation(); + } } }; @@ -2511,9 +2519,7 @@ ); this.actions.add( this.getActionWidgets( actions ) ); - if ( this.constructor.static.escapable ) { - this.$element.on( 'keydown', this.onDialogKeyDownHandler ); - } + this.$element.on( 'keydown', this.onDialogKeyDownHandler ); }, this ); }; @@ -2524,9 +2530,7 @@ // Parent method return OO.ui.Dialog.parent.prototype.getTeardownProcess.call( this, data ) .first( function () { - if ( this.constructor.static.escapable ) { - this.$element.off( 'keydown', this.onDialogKeyDownHandler ); - } + this.$element.off( 'keydown', this.onDialogKeyDownHandler ); this.actions.clear(); this.currentAction = null; diff --git a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json index aae5201..ec755a1 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json +++ b/resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json @@ -13,6 +13,7 @@ "ltr": "images/icons/calendar-ltr.svg", "rtl": "images/icons/calendar-rtl.svg" } }, + "code": { "file": "images/icons/code.svg" }, "find": { "file": { "ltr": "images/icons/find-ltr.svg", "rtl": "images/icons/find-rtl.svg" @@ -25,6 +26,7 @@ "ltr": "images/icons/layout-ltr.svg", "rtl": "images/icons/layout-rtl.svg" } }, + "markup": { "file": "images/icons/markup.svg" }, "newline": { "file": { "ltr": "images/icons/newline-ltr.svg", "rtl": "images/icons/newline-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/apex/icons-editing-core.json b/resources/lib/oojs-ui/themes/apex/icons-editing-core.json index ceb3199..b303071 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-editing-core.json +++ b/resources/lib/oojs-ui/themes/apex/icons-editing-core.json @@ -19,6 +19,14 @@ "ltr": "images/icons/external-link-ltr.svg", "rtl": "images/icons/external-link-rtl.svg" } }, - "linkSecure": { "file": "images/icons/secure-link.svg" } + "linkSecure": { "file": "images/icons/secure-link.svg" }, + "redo": { "file": { + "ltr": "images/icons/arched-arrow-ltr.svg", + "rtl": "images/icons/arched-arrow-rtl.svg" + } }, + "undo": { "file": { + "ltr": "images/icons/arched-arrow-rtl.svg", + "rtl": "images/icons/arched-arrow-ltr.svg" + } } } } diff --git a/resources/lib/oojs-ui/themes/apex/icons-editing-styling.json b/resources/lib/oojs-ui/themes/apex/icons-editing-styling.json index decae86..bd26399 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-editing-styling.json +++ b/resources/lib/oojs-ui/themes/apex/icons-editing-styling.json @@ -31,7 +31,7 @@ "fr,it": "images/icons/bold-g.svg", "hy": "images/icons/bold-armn-to.svg", "ka": "images/icons/bold-geor-man.svg", - "ky,ru": "images/icons/bold-cyrl-zhe.svg", + "ky,ru,uk": "images/icons/bold-cyrl-zhe.svg", "nl": "images/icons/bold-v.svg", "os": "images/icons/bold-cyrl-be.svg" } @@ -41,7 +41,7 @@ "lang": { "ar": "images/icons/italic-arab-meem.svg", "cs,en,fr,he,ml,pl,pt,sco": "images/icons/italic-i.svg", - "be,da,de,fi,ky,nn,no,os,sv,ru": "images/icons/italic-k.svg", + "be,da,de,fi,ky,nn,no,os,sv,ru,uk": "images/icons/italic-k.svg", "es,gl,it,nl": "images/icons/italic-c.svg", "eu": "images/icons/italic-e.svg", "fa": "images/icons/italic-arab-keheh-jeem.svg", diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/markup.png b/resources/lib/oojs-ui/themes/apex/images/icons/markup.png new file mode 100644 index 0000000..c78f418 --- /dev/null +++ b/resources/lib/oojs-ui/themes/apex/images/icons/markup.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/markup.svg b/resources/lib/oojs-ui/themes/apex/images/icons/markup.svg new file mode 100644 index 0000000..7f8c253 --- /dev/null +++ b/resources/lib/oojs-ui/themes/apex/images/icons/markup.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0 24 24"> + <g id="markup"> + <path id="left-bracket" d="M9.665 6.32l-4.259 4.274-1.406 1.406 1.406 1.406 4.259 4.274 1.406-1.438-4.259-4.243 4.259-4.243z"/> + <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" xlink:href="#left-bracket"/> + </g> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json index b03950c..40516c0 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json @@ -20,6 +20,7 @@ "ltr": "images/icons/calendar-ltr.svg", "rtl": "images/icons/calendar-rtl.svg" } }, + "code": { "file": "images/icons/code.svg" }, "find": { "file": { "ltr": "images/icons/find-ltr.svg", "rtl": "images/icons/find-rtl.svg" @@ -32,6 +33,7 @@ "ltr": "images/icons/layout-ltr.svg", "rtl": "images/icons/layout-rtl.svg" } }, + "markup": { "file": "images/icons/markup.svg" }, "newline": { "file": { "ltr": "images/icons/newline-ltr.svg", "rtl": "images/icons/newline-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json index ffa8905..d70f60e 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json @@ -11,7 +11,7 @@ "color": "#347bff" }, "constructive": { - "color": "#00af89" + "color": "#347bff" }, "destructive": { "color": "#d11d13" @@ -41,6 +41,14 @@ "ltr": "images/icons/external-link-ltr.svg", "rtl": "images/icons/external-link-rtl.svg" } }, - "linkSecure": { "file": "images/icons/secure-link.svg" } + "linkSecure": { "file": "images/icons/secure-link.svg" }, + "redo": { "file": { + "ltr": "images/icons/arched-arrow-ltr.svg", + "rtl": "images/icons/arched-arrow-rtl.svg" + } }, + "undo": { "file": { + "ltr": "images/icons/arched-arrow-rtl.svg", + "rtl": "images/icons/arched-arrow-ltr.svg" + } } } } diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json index 28188ea..45c6a64 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json @@ -38,7 +38,7 @@ "fr,it": "images/icons/bold-g.svg", "hy": "images/icons/bold-armn-to.svg", "ka": "images/icons/bold-geor-man.svg", - "ky,ru": "images/icons/bold-cyrl-zhe.svg", + "ky,ru,uk": "images/icons/bold-cyrl-zhe.svg", "nl": "images/icons/bold-v.svg", "os": "images/icons/bold-cyrl-be.svg" } @@ -48,7 +48,7 @@ "lang": { "ar": "images/icons/italic-arab-meem.svg", "cs,en,fr,he,ml,pl,pt,sco": "images/icons/italic-i.svg", - "be,da,de,fi,ky,nn,no,os,sv,ru": "images/icons/italic-k.svg", + "be,da,de,fi,ky,nn,no,os,sv,ru,uk": "images/icons/italic-k.svg", "es,gl,it,nl": "images/icons/italic-c.svg", "eu": "images/icons/italic-e.svg", "fa": "images/icons/italic-arab-keheh-jeem.svg", diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json b/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json index b713146..efad42e 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-layout.json @@ -11,7 +11,7 @@ "color": "#347bff" }, "constructive": { - "color": "#00af89" + "color": "#347bff" }, "destructive": { "color": "#d11d13" diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json index 7029bc2..65c7c5b 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json @@ -11,7 +11,7 @@ "color": "#347bff" }, "constructive": { - "color": "#00af89" + "color": "#347bff" }, "destructive": { "color": "#d11d13" @@ -45,7 +45,7 @@ }, "variants": [ "progressive" ] }, - "star": { "file": "images/icons/star.svg", "variants": [ "constructive" ] }, + "star": { "file": "images/icons/star.svg", "variants": [ "constructive", "progressive" ] }, "trash": { "file": "images/icons/trash.svg" }, "trashUndo": { "file": { "ltr": "images/icons/trashUndo-ltr.svg", @@ -55,6 +55,6 @@ "ltr": "images/icons/unLock-ltr.svg", "rtl": "images/icons/unLock-rtl.svg" }, "variants": [ "destructive" ] }, - "unStar": { "file": "images/icons/unStar.svg", "variants": [ "constructive" ] } + "unStar": { "file": "images/icons/unStar.svg", "variants": [ "constructive", "progressive" ] } } } diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons.json b/resources/lib/oojs-ui/themes/mediawiki/icons.json index c332e3c..047bc6b 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons.json @@ -11,6 +11,9 @@ "color": "#347bff" }, "constructive": { + "color": "#347bff" + }, + "constructive-deprecated": { "color": "#00af89" }, "destructive": { @@ -21,12 +24,12 @@ } }, "images": { - "add": { "file": "images/icons/add.svg", "variants": [ "constructive" ] }, + "add": { "file": "images/icons/add.svg", "variants": [ "constructive", "progressive" ] }, "advanced": { "file": "images/icons/advanced.svg" }, "alert": { "file": "images/icons/alert.svg", "variants": [ "warning" ] }, "cancel": { "file": "images/icons/cancel.svg", "variants": [ "destructive" ] }, - "check": { "file": "images/icons/check.svg", "variants": [ "constructive", "progressive", "destructive" ] }, - "circle": { "file": "images/icons/circle.svg", "variants": [ "constructive" ] }, + "check": { "file": "images/icons/check.svg", "variants": [ "constructive-deprecated", "constructive", "progressive", "destructive" ] }, + "circle": { "file": "images/icons/circle.svg", "variants": [ "constructive-deprecated", "constructive", "progressive" ] }, "close": { "file": { "ltr": "images/icons/close-ltr.svg", "rtl": "images/icons/close-rtl.svg" diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png index 3f6b88e..02d4f12 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg index 0bd0e73..34a4bba 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <g id="add"> <path id="plus" d="M13 6h-2v5H6v2h5v5h2v-5h5v-2h-5z"/> </g> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.png new file mode 100644 index 0000000..02d4f12 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.svg new file mode 100644 index 0000000..34a4bba --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/add-progressive.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> + <g id="add"> + <path id="plus" d="M13 6h-2v5H6v2h5v5h2v-5h5v-2h-5z"/> + </g> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.png new file mode 100644 index 0000000..a0f9871 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.svg new file mode 100644 index 0000000..07a5614 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive-deprecated.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> + <path d="M17 7.5L9.5 15 6 11.5 4.5 13l5 5L20 7.5c-.706-.706-2.294-.706-3 0z" id="check"/> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.png index a0f9871..eb72d14 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg index 07a5614..3084e5a 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/check-constructive.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <path d="M17 7.5L9.5 15 6 11.5 4.5 13l5 5L20 7.5c-.706-.706-2.294-.706-3 0z" id="check"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.png new file mode 100644 index 0000000..43ed482 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.svg new file mode 100644 index 0000000..b96e771 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive-deprecated.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> + <circle cx="12" cy="12" r="6"/> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.png index 43ed482..d2e71c6 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.svg index b96e771..136b43e 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-constructive.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <circle cx="12" cy="12" r="6"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.png new file mode 100644 index 0000000..d2e71c6 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.svg new file mode 100644 index 0000000..136b43e --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/circle-progressive.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> + <circle cx="12" cy="12" r="6"/> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.png new file mode 100644 index 0000000..0f64c02 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.svg new file mode 100644 index 0000000..9d87725 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup-invert.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #ffffff }</style> + <g id="markup"> + <path id="left-bracket" d="M9.665 6.32l-4.259 4.274-1.406 1.406 1.406 1.406 4.259 4.274 1.406-1.438-4.259-4.243 4.259-4.243z"/> + <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" xlink:href="#left-bracket"/> + </g> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.png new file mode 100644 index 0000000..c78f418 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.svg new file mode 100644 index 0000000..7f8c253 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/markup.svg @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0 24 24"> + <g id="markup"> + <path id="left-bracket" d="M9.665 6.32l-4.259 4.274-1.406 1.406 1.406 1.406 4.259 4.274 1.406-1.438-4.259-4.243 4.259-4.243z"/> + <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" xlink:href="#left-bracket"/> + </g> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.png index cc3a4d3..39e7978 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.svg index ffe5556..4a6dae9 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-constructive.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <path d="M12 7.4l1.7 3.6 4 .5-2.7 2.8.5 3.9-3.5-1.7-3.6 1.7.6-3.9-2.8-2.8 3.9-.5L12 7.4M12 4L9.2 9.6l-6.2.9 4.5 4.4L6.4 21l5.6-3 5.5 3-1-6.2 4.5-4.4-6.3-.9L12 4z"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.png new file mode 100644 index 0000000..39e7978 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.svg new file mode 100644 index 0000000..4a6dae9 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/star-progressive.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> + <path d="M12 7.4l1.7 3.6 4 .5-2.7 2.8.5 3.9-3.5-1.7-3.6 1.7.6-3.9-2.8-2.8 3.9-.5L12 7.4M12 4L9.2 9.6l-6.2.9 4.5 4.4L6.4 21l5.6-3 5.5 3-1-6.2 4.5-4.4-6.3-.9L12 4z"/> +</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png index c5574ba..41e2735 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg index 9feb601..1526306 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <path d="M18.748 11.717a1 1 0 0 1 0 1.414l-4.95 4.95a1 1 0 0 1-1.413 0l-6.01-6.01c-.39-.382-.707-1.15-.707-1.7V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457a1.477 1.477 0 0 0 0 2.092 1.49 1.49 0 0 0 2.094 0 1.49 1.49 0 0 0 0-2.1 1.484 1.484 0 0 0-2.094 0z" id="tag"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.png index 2964300..7601951 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.svg index 5e98ccb..131743d 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-constructive.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00af89 }</style> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> <path d="M21 11l-6-1-3-6-3 6-6 1 4 4-1 6 6-3 6 3-1-6 4-4z"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.png new file mode 100644 index 0000000..7601951 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.svg new file mode 100644 index 0000000..131743d --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/unStar-progressive.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347bff }</style> + <path d="M21 11l-6-1-3-6-3 6-6 1 4 4-1 6 6-3 6 3-1-6 4-4z"/> +</svg> -- To view, visit https://gerrit.wikimedia.org/r/276003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c7402606bbc5ea1c20548b7eae657338b4ae151 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
