VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342867 )
Change subject: Update OOjs UI to v0.20.0 ...................................................................... Update OOjs UI to v0.20.0 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.20.0 Change-Id: I10ef5d85fcfae3a0b22b07a8a5ed3ae3e2d51288 --- M composer.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-interactions.json M resources/lib/oojs-ui/themes/apex/icons-moderation.json D resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.png D resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.svg D resources/lib/oojs-ui/themes/apex/images/icons/beta.png D resources/lib/oojs-ui/themes/apex/images/icons/beta.svg D resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png D resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg D resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png D resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg D resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.png D resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.svg D resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.png D resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.svg M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json M resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.svg D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.svg D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.png D resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.svg D resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.png D resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/indicators.json 63 files changed, 202 insertions(+), 327 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/67/342867/1 diff --git a/composer.json b/composer.json index af8635a..df699bc 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.19.5", + "oojs/oojs-ui": "0.20.0", "oyejorge/less.php": "1.7.0.13", "php": ">=5.5.9", "psr/log": "1.0.2", diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 53ce966..a13441b 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( 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 369cf09..382c13b 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,18 +1,19 @@ /*! - * OOjs UI v0.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-element-hidden { display: none !important; } .oo-ui-buttonElement { display: inline-block; + line-height: normal; vertical-align: middle; } .oo-ui-buttonElement > .oo-ui-buttonElement-button { @@ -24,7 +25,6 @@ vertical-align: middle; font-family: inherit; font-size: inherit; - line-height: normal; white-space: nowrap; -webkit-touch-callout: none; -webkit-user-select: none; @@ -310,6 +310,10 @@ .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field { width: 1px; } +.oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header, +.oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field { + display: block; +} .oo-ui-fieldLayout .oo-ui-fieldLayout-help { float: right; } @@ -571,7 +575,6 @@ opacity: 0.2; } .oo-ui-radioOptionWidget { - cursor: default; padding: 0; background-color: transparent; } @@ -868,11 +871,15 @@ display: block; } .oo-ui-dropdownInputWidget select { + background-position: -9999em 0; + background-repeat: no-repeat; width: 100%; - cursor: pointer; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; +} +.oo-ui-dropdownInputWidget.oo-ui-widget-enabled select { + cursor: pointer; } .oo-ui-dropdownInputWidget select { background-color: #fff; @@ -1301,7 +1308,6 @@ color: #ccc; } .oo-ui-checkboxMultioptionWidget { - cursor: default; padding: 0; } .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget, diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index b041ef4..c4fdf20 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,18 +1,19 @@ /*! - * OOjs UI v0.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-element-hidden { display: none !important; } .oo-ui-buttonElement { display: inline-block; + line-height: normal; vertical-align: middle; } .oo-ui-buttonElement > .oo-ui-buttonElement-button { @@ -24,7 +25,6 @@ vertical-align: middle; font-family: inherit; font-size: inherit; - line-height: normal; white-space: nowrap; -webkit-touch-callout: none; -webkit-user-select: none; @@ -179,7 +179,7 @@ position: relative; min-height: 2.5em; border-radius: 2px; - padding: 0.546875em 1em; + padding: 0.625em 1em 0.546875em; } .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button { min-width: 3.125em; @@ -189,8 +189,11 @@ min-width: 0; } .oo-ui-buttonElement-framed > input.oo-ui-buttonElement-button, +.oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button { + line-height: 1; +} .oo-ui-buttonElement-framed.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - line-height: 1.25; + line-height: 1.172em; } .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { display: block; @@ -451,6 +454,10 @@ .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field { width: 1px; } +.oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header, +.oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field { + display: block; +} .oo-ui-fieldLayout .oo-ui-fieldLayout-help { float: right; } @@ -664,7 +671,6 @@ position: relative; display: block; border: 0; - padding: 0.25em 0.5em; } .oo-ui-optionWidget.oo-ui-widget-enabled { cursor: pointer; @@ -716,22 +722,15 @@ border-color: #fff; } .oo-ui-radioOptionWidget { - cursor: default; - padding: 0.25em 0; - background-color: transparent; + padding: 0.3125em 0; } .oo-ui-radioOptionWidget .oo-ui-radioInputWidget, .oo-ui-radioOptionWidget.oo-ui-labelElement .oo-ui-labelElement-label { display: inline-block; vertical-align: middle; } -.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected, -.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed, -.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted { - background-color: transparent; -} .oo-ui-radioOptionWidget.oo-ui-labelElement .oo-ui-labelElement-label { - padding: 0.25em 0.25em 0.25em 0.46875em; + padding-left: 0.46875em; } .oo-ui-radioOptionWidget .oo-ui-radioInputWidget { margin-right: 0; @@ -1107,7 +1106,7 @@ margin-top: 0; } .oo-ui-checkboxMultiselectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body { - padding: 0.25em 0; + padding: 0.3125em 0; } .oo-ui-checkboxMultiselectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body .oo-ui-labelElement-label { line-height: 1.5; @@ -1126,11 +1125,15 @@ display: block; } .oo-ui-dropdownInputWidget select { + background-position: -9999em 0; + background-repeat: no-repeat; width: 100%; - cursor: pointer; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; +} +.oo-ui-dropdownInputWidget.oo-ui-widget-enabled select { + cursor: pointer; } .oo-ui-dropdownInputWidget-php { border-right: 1px solid #a2a9b1; @@ -1151,6 +1154,15 @@ font-family: inherit; vertical-align: middle; } +.oo-ui-dropdownInputWidget select::-ms-expand { + display: none; +} +.oo-ui-dropdownInputWidget select:not( [no-ie] ) { + background-position: right 1.75em center; + width: calc( 100% + 1em ); + height: 2.5em; + padding: 0 0 0 1em; +} .oo-ui-dropdownInputWidget option { font-size: inherit; font-family: inherit; @@ -1159,8 +1171,6 @@ } .oo-ui-dropdownInputWidget.oo-ui-widget-enabled select { background-color: #f8f9fa; - background-position: -9999em 0; - background-repeat: no-repeat; color: #222; -webkit-transition: background-color 100ms, border-color 100ms, box-shadow 100ms; -moz-transition: background-color 100ms, border-color 100ms, box-shadow 100ms; @@ -1179,15 +1189,6 @@ border-color: #36c; outline: 0; box-shadow: inset 0 0 0 1px #36c; -} -.oo-ui-dropdownInputWidget.oo-ui-widget-enabled select::-ms-expand { - display: none; -} -.oo-ui-dropdownInputWidget.oo-ui-widget-enabled select:not( [no-ie] ) { - background-position: right 1.75em center; - width: calc( 100% + 1em ); - height: 2.5em; - padding: 0 0 0 1em; } .oo-ui-dropdownInputWidget.oo-ui-widget-disabled select { background-color: #eaecf0; @@ -1297,7 +1298,7 @@ margin-top: 0; } .oo-ui-radioSelectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body { - padding: 0.25em 0; + padding: 0.3125em 0; } .oo-ui-radioSelectInputWidget .oo-ui-fieldLayout .oo-ui-fieldLayout-body .oo-ui-labelElement-label { line-height: 1.5; @@ -1497,6 +1498,7 @@ .oo-ui-textInputWidget.oo-ui-widget-disabled input, .oo-ui-textInputWidget.oo-ui-widget-disabled textarea { background-color: #eaecf0; + -webkit-text-fill-color: #72777d; color: #72777d; text-shadow: 0 1px 1px #fff; border-color: #c8ccd1; @@ -1515,7 +1517,7 @@ } .oo-ui-textInputWidget.oo-ui-iconElement .oo-ui-iconElement-icon { left: 0; - max-height: 2.375em; + max-height: 2.5em; margin-left: 0.5em; background-position: right center; } @@ -1525,7 +1527,7 @@ } .oo-ui-textInputWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator { height: 100%; - max-height: 2.375em; + max-height: 2.5em; margin: 0 0.775em; } .oo-ui-textInputWidget > .oo-ui-labelElement-label { @@ -1750,6 +1752,12 @@ border-bottom-right-radius: 0; border-right-width: 0; } +.oo-ui-comboBoxInputWidget.oo-ui-comboBoxInputWidget-empty input, +.oo-ui-comboBoxInputWidget-php input { + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + border-right-width: 1px; +} .oo-ui-comboBoxInputWidget-dropdownButton { width: 2.5em; } @@ -1763,9 +1771,6 @@ .oo-ui-comboBoxInputWidget-dropdownButton .oo-ui-buttonElement-button:focus { border-top-left-radius: 0; border-bottom-left-radius: 0; -} -.oo-ui-comboBoxInputWidget.oo-ui-comboBoxInputWidget-empty input { - border-right-width: 1px; } .oo-ui-comboBoxInputWidget.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator { opacity: 1; @@ -1790,8 +1795,7 @@ color: #72777d; } .oo-ui-checkboxMultioptionWidget { - cursor: default; - padding: 0.25em 0; + padding: 0.3125em 0; } .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget, .oo-ui-checkboxMultioptionWidget.oo-ui-labelElement .oo-ui-labelElement-label { @@ -1799,7 +1803,7 @@ vertical-align: middle; } .oo-ui-checkboxMultioptionWidget.oo-ui-labelElement .oo-ui-labelElement-label { - padding: 0.25em 0.25em 0.25em 0.46875em; + padding-left: 0.46875em; } .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget { margin-right: 0; diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index f10bdfa..fe11d68 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( function ( OO ) { @@ -1223,22 +1223,16 @@ * @param {string} [config.duration='fast'] jQuery animation duration value * @param {string} [config.direction] Scroll in only one direction, e.g. 'x' or 'y', omit * to scroll in both directions - * @param {Function} [config.complete] Function to call when scrolling completes. - * Deprecated since 0.15.4, use the return promise instead. * @return {jQuery.Promise} Promise which resolves when the scroll is complete */ OO.ui.Element.static.scrollIntoView = function ( el, config ) { - var position, animations, callback, container, $container, elementDimensions, containerDimensions, $window, + var position, animations, container, $container, elementDimensions, containerDimensions, $window, deferred = $.Deferred(); // Configuration initialization config = config || {}; animations = {}; - callback = typeof config.complete === 'function' && config.complete; - if ( callback ) { - OO.ui.warnDeprecation( 'Element#scrollIntoView: The `complete` callback config option is deprecated. Use the return promise instead.' ); - } container = this.getClosestScrollableContainer( el, config.direction ); $container = $( container ); elementDimensions = this.getDimensions( el ); @@ -1281,16 +1275,10 @@ if ( !$.isEmptyObject( animations ) ) { $container.stop( true ).animate( animations, config.duration === undefined ? 'fast' : config.duration ); $container.queue( function ( next ) { - if ( callback ) { - callback(); - } deferred.resolve(); next(); } ); } else { - if ( callback ) { - callback(); - } deferred.resolve(); } return deferred.promise(); @@ -3541,6 +3529,12 @@ */ OO.ui.ButtonWidget.static.cancelButtonMouseDownEvents = false; +/** + * @static + * @inheritdoc + */ +OO.ui.ButtonWidget.static.tagName = 'span'; + /* Methods */ /** @@ -3717,6 +3711,14 @@ OO.inheritClass( OO.ui.ButtonGroupWidget, OO.ui.Widget ); OO.mixinClass( OO.ui.ButtonGroupWidget, OO.ui.mixin.GroupElement ); + +/* Static Properties */ + +/** + * @static + * @inheritdoc + */ +OO.ui.ButtonGroupWidget.static.tagName = 'span'; /** * IconWidget is a generic widget for {@link OO.ui.mixin.IconElement icons}. In general, IconWidgets should be used with OO.ui.LabelWidget, @@ -5247,12 +5249,6 @@ * `backwards` or `forwards`. */ OO.ui.PopupWidget.prototype.setAlignment = function ( align ) { - // Transform values deprecated since v0.11.0 - if ( align === 'left' || align === 'right' ) { - OO.ui.warnDeprecation( 'PopupWidget#setAlignment parameter value `' + align + '` is deprecated. Use `force-right` or `force-left` instead.' ); - align = { left: 'force-right', right: 'force-left' }[ align ]; - } - // Validate alignment if ( [ 'force-left', 'force-right', 'backwards', 'forwards', 'center' ].indexOf( align ) > -1 ) { this.align = align; @@ -6723,7 +6719,8 @@ OO.ui.MenuSectionOptionWidget.parent.call( this, config ); // Initialization - this.$element.addClass( 'oo-ui-menuSectionOptionWidget' ); + this.$element.addClass( 'oo-ui-menuSectionOptionWidget' ) + .attr( 'role', '' ); }; /* Setup */ @@ -7939,23 +7936,6 @@ return this; }; -/* - * The old name for the FloatingMenuSelectWidget widget, provided for backwards-compatibility. - * - * @class - * @extends OO.ui.FloatingMenuSelectWidget - * - * @constructor - * @deprecated since v0.12.5. - */ -OO.ui.TextInputMenuSelectWidget = function OoUiTextInputMenuSelectWidget() { - OO.ui.warnDeprecation( 'TextInputMenuSelectWidget is deprecated. Use the FloatingMenuSelectWidget instead.' ); - // Parent constructor - OO.ui.TextInputMenuSelectWidget.parent.apply( this, arguments ); -}; - -OO.inheritClass( OO.ui.TextInputMenuSelectWidget, OO.ui.FloatingMenuSelectWidget ); - /** * Progress bars visually display the status of an operation, such as a download, * and can be either determinate or indeterminate: @@ -8429,6 +8409,12 @@ */ OO.ui.ButtonInputWidget.static.supportsSimpleLabel = false; +/** + * @static + * @inheritdoc + */ +OO.ui.ButtonInputWidget.static.tagName = 'span'; + /* Methods */ /** @@ -8542,6 +8528,14 @@ /* Setup */ OO.inheritClass( OO.ui.CheckboxInputWidget, OO.ui.InputWidget ); + +/* Static Properties */ + +/** + * @static + * @inheritdoc + */ +OO.ui.CheckboxInputWidget.static.tagName = 'span'; /* Static Methods */ @@ -8740,10 +8734,17 @@ .clearItems() .addItems( options.map( function ( opt ) { var optValue = widget.cleanUpValue( opt.data ); - return new OO.ui.MenuOptionWidget( { - data: optValue, - label: opt.label !== undefined ? opt.label : optValue - } ); + + if ( opt.optgroup === undefined ) { + return new OO.ui.MenuOptionWidget( { + data: optValue, + label: opt.label !== undefined ? opt.label : optValue + } ); + } else { + return new OO.ui.MenuSectionOptionWidget( { + label: opt.optgroup + } ); + } } ) ); // Restore the previous value, or reset to something sensible @@ -8835,6 +8836,14 @@ /* Setup */ OO.inheritClass( OO.ui.RadioInputWidget, OO.ui.InputWidget ); + +/* Static Properties */ + +/** + * @static + * @inheritdoc + */ +OO.ui.RadioInputWidget.static.tagName = 'span'; /* Static Methods */ @@ -9266,7 +9275,7 @@ * @constructor * @param {Object} [config] Configuration options * @cfg {string} [type='text'] The value of the HTML `type` attribute: 'text', 'password', 'search', - * 'email', 'url', 'date', 'month' or 'number'. Ignored if `multiline` is true. + * 'email', 'url' or 'number'. Ignored if `multiline` is true. * * Some values of `type` result in additional behaviors: * @@ -9793,8 +9802,6 @@ 'search', 'email', 'url', - 'date', - 'month', 'number' ]; return allowedTypes.indexOf( config.type ) !== -1 ? config.type : 'text'; @@ -10547,9 +10554,9 @@ this.fieldWidget = fieldWidget; this.errors = []; this.notices = []; - this.$field = $( '<div>' ); + this.$field = this.isFieldInline() ? $( '<span>' ) : $( '<div>' ); this.$messages = $( '<ul>' ); - this.$header = $( '<div>' ); + this.$header = $( '<span>' ); this.$body = $( '<div>' ); this.align = null; if ( config.help ) { @@ -10630,6 +10637,17 @@ }; /** + * Return `true` if the given field widget can be used with `'inline'` alignment (see + * #setAlignment). Return `false` if it can't or if this can't be determined. + * + * @return {boolean} + */ +OO.ui.FieldLayout.prototype.isFieldInline = function () { + // This is very simplistic, but should be good enough. + return this.getField().$element.prop( 'tagName' ).toLowerCase() === 'span'; +}; + +/** * @protected * @param {string} kind 'error' or 'notice' * @param {string|OO.ui.HtmlSnippet} text @@ -10664,6 +10682,10 @@ // Default to 'left' if ( [ 'left', 'right', 'top', 'inline' ].indexOf( value ) === -1 ) { value = 'left'; + } + // Validate + if ( value === 'inline' && !this.isFieldInline() ) { + value = 'top'; } // Reorder elements if ( value === 'top' ) { @@ -10800,8 +10822,8 @@ // Properties this.buttonWidget = buttonWidget; - this.$button = $( '<div>' ); - this.$input = $( '<div>' ); + this.$button = $( '<span>' ); + this.$input = this.isFieldInline() ? $( '<span>' ) : $( '<div>' ); // Initialization this.$element diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 7b1c099..b4a6392 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( 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 7604589..479e2a5 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .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 ad1746d..df77684 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-tool.oo-ui-widget-enabled { -webkit-transition: background-color 100ms; diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index 1574f6c..7d09854 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( 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 4ec3d1c..7f8389e 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -894,6 +894,10 @@ .oo-ui-numberInputWidget-buttoned .oo-ui-buttonWidget, .oo-ui-numberInputWidget-buttoned .oo-ui-textInputWidget { display: table-cell; + height: 100%; +} +.oo-ui-numberInputWidget-buttoned .oo-ui-textInputWidget input { + height: 100%; } .oo-ui-numberInputWidget-field { display: table; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index f64a619..c79dc85 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -561,9 +561,10 @@ box-sizing: border-box; display: block; right: 2.375em; - margin: 0; - padding-left: 0.5em; - line-height: 2.3; + padding-top: 0.625em; + padding-left: 0.546875em; + padding-bottom: 0.546875em; + line-height: 1.172em; white-space: nowrap; } .oo-ui-selectFileWidget-fileName { @@ -572,14 +573,14 @@ text-overflow: ellipsis; } .oo-ui-selectFileWidget-clearButton { - top: 0; + top: -1px; right: 0; min-width: 24px; width: 1.875em; margin-right: 0; } .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { - height: 2.3em; + height: 2.5em; } .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label { color: #72777d; @@ -643,11 +644,13 @@ } .oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, -.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon { + opacity: 0.51; +} .oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator { - opacity: 0.51; + opacity: 0.15; } .oo-ui-widget-disabled .oo-ui-selectFileWidget-dropLabel { display: none; @@ -1026,6 +1029,10 @@ .oo-ui-numberInputWidget-buttoned .oo-ui-buttonWidget, .oo-ui-numberInputWidget-buttoned .oo-ui-textInputWidget { display: table-cell; + height: 100%; +} +.oo-ui-numberInputWidget-buttoned .oo-ui-textInputWidget input { + height: 100%; } .oo-ui-numberInputWidget-field { display: table; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index d1fbe0d..c2e62fd95 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( function ( OO ) { @@ -2739,6 +2739,14 @@ OO.mixinClass( OO.ui.ToggleButtonWidget, OO.ui.mixin.FlaggedElement ); OO.mixinClass( OO.ui.ToggleButtonWidget, OO.ui.mixin.TabIndexedElement ); +/* Static Properties */ + +/** + * @static + * @inheritdoc + */ +OO.ui.ToggleButtonWidget.static.tagName = 'span'; + /* Methods */ /** @@ -3969,7 +3977,7 @@ } if ( !same ) { this.emit( 'change', this.getItemsData() ); - this.updateIfHeightChanged(); + this.updateInputSize(); } return this; @@ -4009,7 +4017,7 @@ } if ( !same ) { this.emit( 'change', this.getItemsData() ); - this.updateIfHeightChanged(); + this.updateInputSize(); } return this; @@ -4022,7 +4030,7 @@ if ( this.items.length ) { OO.ui.mixin.GroupElement.prototype.clearItems.call( this ); this.emit( 'change', this.getItemsData() ); - this.updateIfHeightChanged(); + this.updateInputSize(); } return this; }; @@ -4235,6 +4243,7 @@ currentWidth = this.$input.width(); if ( contentWidth < currentWidth ) { + this.updateIfHeightChanged(); // All is fine, don't perform expensive calculations return; } @@ -4255,6 +4264,8 @@ bestWidth = this.$content.innerWidth() - 10; } this.$input.width( Math.floor( bestWidth ) ); + this.updateIfHeightChanged(); + } else { this.updateIfHeightChanged(); } }; @@ -4375,23 +4386,6 @@ } return this; }; - -/** - * The old name for the CapsuleMultiselectWidget widget, provided for backwards-compatibility. - * - * @class - * @extends OO.ui.CapsuleMultiselectWidget - * - * @constructor - * @deprecated since 0.17.3; use OO.ui.CapsuleMultiselectWidget instead - */ -OO.ui.CapsuleMultiSelectWidget = function OoUiCapsuleMultiSelectWidget() { - OO.ui.warnDeprecation( 'CapsuleMultiSelectWidget is deprecated. Use the CapsuleMultiselectWidget instead.' ); - // Parent constructor - OO.ui.CapsuleMultiSelectWidget.parent.apply( this, arguments ); -}; - -OO.inheritClass( OO.ui.CapsuleMultiSelectWidget, OO.ui.CapsuleMultiselectWidget ); /** * SelectFileWidgets allow for selecting files, using the HTML5 File API. These diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index 4353b43..17caa33 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); @@ -124,13 +124,9 @@ color: #000; } .oo-ui-messageDialog-message { - font-size: 0.9em; - line-height: 1.25em; - color: #666; -} -.oo-ui-messageDialog-message-verbose { font-size: 1.1em; line-height: 1.5em; + color: #666; text-align: left; } .oo-ui-messageDialog-actions-horizontal .oo-ui-actionWidget { diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index 823b1a1..0530610 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:06Z + * Date: 2017-03-15T17:06:28Z */ .oo-ui-window { background: transparent; @@ -117,13 +117,9 @@ color: #000; } .oo-ui-messageDialog-message { - font-size: 0.9em; - line-height: 1.25; - color: #222; -} -.oo-ui-messageDialog-message-verbose { font-size: 1.1em; line-height: 1.4; + color: #222; text-align: left; } .oo-ui-messageDialog-actions-horizontal .oo-ui-actionWidget { @@ -141,7 +137,7 @@ border-bottom-width: 0; } .oo-ui-messageDialog-actions .oo-ui-actionWidget { - min-height: 3.4em; + min-height: 3.4375em; margin-right: 0; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:last-child { @@ -151,7 +147,7 @@ border-radius: 0; } .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-labelElement .oo-ui-labelElement-label { - line-height: 3.4; + line-height: 3.4375em; text-align: center; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:hover { @@ -215,36 +211,29 @@ overflow-y: auto; } .oo-ui-processDialog-content .oo-ui-window-head { - height: 3.4em; + height: 3.4375em; } .oo-ui-processDialog-content .oo-ui-window-body { - top: 3.4em; - outline: 1px solid rgba(0, 0, 0, 0.2); + top: 3.4375em; + outline: 1px solid #c8ccd1; } .oo-ui-processDialog-navigation { position: relative; - height: 3.4em; - padding: 0 1em; + height: 3.4375em; } .oo-ui-processDialog-location { - padding: 0.75em 0; - height: 1.875em; + height: 3.4375em; cursor: default; text-align: center; } .oo-ui-processDialog-title { font-weight: bold; - line-height: 1.875em; + line-height: 3.4375em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-framed { - margin: 0.5em; -} -.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-frameless, -.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-frameless, -.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-frameless { - margin: 0; + margin: 0.46875em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button, @@ -381,7 +370,7 @@ top: 1em; bottom: 1em; max-height: 100%; - max-height: calc(100% - 2em); + max-height: calc( 100% - 2em ); border: 1px solid #a2a9b1; border-radius: 2px; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.25); diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index 586efb0..ab78a4a 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.19.5 + * OOjs UI v0.20.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2017 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2017-03-07T22:57:01Z + * Date: 2017-03-15T17:06:24Z */ ( function ( OO ) { @@ -118,7 +118,10 @@ if ( width !== this.width || height !== this.height ) { this.width = width; this.height = height; - this.emit( 'resize' ); + this.emit( 'resizePrivate' ); + if ( this.emit( 'resize' ) ) { + OO.ui.warnDeprecation( 'ActionWidget: resize event is deprecated. See T129162.' ); + } } } @@ -561,9 +564,13 @@ action = actions[ i ]; action.connect( this, { click: [ 'emit', 'click', action ], - resize: [ 'emit', 'resize', action ], toggle: [ 'onActionChange' ] } ); + action.on( 'resizePrivate', function ( action ) { + if ( this.emit( 'resize', action ) ) { + OO.ui.warnDeprecation( 'ActionSet: resize event is deprecated. See T129162.' ); + } + }, [ action ], this ); this.list.push( action ); } this.organized = false; @@ -2734,12 +2741,6 @@ OO.ui.MessageDialog.static.size = 'small'; /** - * @static - * @deprecated since v0.18.4 as default; TODO: Remove - */ -OO.ui.MessageDialog.static.verbose = true; - -/** * Dialog title. * * The title of a confirmation dialog describes what a progressive action will do. The @@ -2855,11 +2856,6 @@ ); this.message.setLabel( data.message !== undefined ? data.message : this.constructor.static.message - ); - // @deprecated since v0.18.4 as default; TODO: Remove and make default instead. - this.message.$element.toggleClass( - 'oo-ui-messageDialog-message-verbose', - data.verbose !== undefined ? data.verbose : this.constructor.static.verbose ); }, this ); }; diff --git a/resources/lib/oojs-ui/themes/apex/icons-interactions.json b/resources/lib/oojs-ui/themes/apex/icons-interactions.json index ec18f29..5b6ac3c 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-interactions.json +++ b/resources/lib/oojs-ui/themes/apex/icons-interactions.json @@ -9,8 +9,6 @@ }, "images": { "add": { "file": "images/icons/add.svg" }, - "beta": { "file": "images/icons/beta.svg", "deprecated": "Deprecated since v0.18.3, don't use." }, - "betaLaunch": { "file": "images/icons/logo-wikimediaDiscovery.svg", "deprecated": "Moved since v0.18.3, use 'logoWikimediaDiscovery' from the 'Wikimedia' pack instead." }, "bookmark": { "file": { "ltr": "images/icons/bookmark-ltr.svg", "rtl": "images/icons/bookmark-rtl.svg" @@ -50,7 +48,6 @@ "ltr": "images/icons/printer-ltr.svg", "rtl": "images/icons/printer-rtl.svg" } }, - "ribbonPrize": { "file": "images/icons/ribbonPrize.svg", "deprecated": "Deprecated since v0.18.3, don't use." }, "subtract": { "file": "images/icons/subtract.svg" }, "sun": { "file": { "ltr": "images/icons/sun-ltr.svg", diff --git a/resources/lib/oojs-ui/themes/apex/icons-moderation.json b/resources/lib/oojs-ui/themes/apex/icons-moderation.json index c8385e4..b32ffbb 100644 --- a/resources/lib/oojs-ui/themes/apex/icons-moderation.json +++ b/resources/lib/oojs-ui/themes/apex/icons-moderation.json @@ -3,10 +3,6 @@ "intro": "@import '../../../../src/styles/common';", "images": { "block": { "file": "images/icons/block.svg" }, - "blockUndo": { "file": { - "ltr": "images/icons/unBlock-ltr.svg", - "rtl": "images/icons/unBlock-rtl.svg" - }, "deprecated": "Renamed since v0.18.3, use 'unBlock' instead." }, "unBlock": { "file": { "ltr": "images/icons/unBlock-ltr.svg", "rtl": "images/icons/unBlock-rtl.svg" @@ -15,10 +11,6 @@ "ltr": "images/icons/flag-ltr.svg", "rtl": "images/icons/flag-rtl.svg" } }, - "flagUndo": { "file": { - "ltr": "images/icons/unFlag-ltr.svg", - "rtl": "images/icons/unFlag-rtl.svg" - }, "deprecated": "Renamed since v0.18.3, use 'unFlag' instead." }, "unFlag": { "file": { "ltr": "images/icons/unFlag-ltr.svg", "rtl": "images/icons/unFlag-rtl.svg" @@ -39,10 +31,6 @@ "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" - }, "deprecated": "Renamed since v0.18.3, use 'unTrash' instead." }, "ongoingConversation": { "file": { "ltr": "images/icons/ongoingConversation-ltr.svg", diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.png b/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.png deleted file mode 100644 index c3b26b8..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.svg b/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.svg deleted file mode 100644 index a140a5a..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/beta-invert.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#FFFFFF"> - <path d="M12 4c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 12l-3-2-1 4-1-4-3 2 2-3-4-1 4-1-2-3 3 2 1-4 1 4 3-2-2 3 4 1-4 1 2 3z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/beta.png b/resources/lib/oojs-ui/themes/apex/images/icons/beta.png deleted file mode 100644 index 7b31e1e..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/beta.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/beta.svg b/resources/lib/oojs-ui/themes/apex/images/icons/beta.svg deleted file mode 100644 index 51a5c78..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/beta.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <path d="M12 4c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 12l-3-2-1 4-1-4-3 2 2-3-4-1 4-1-2-3 3 2 1-4 1 4 3-2-2 3 4 1-4 1 2 3z"/> -</svg> diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png deleted file mode 100644 index 0963538..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg deleted file mode 100644 index 971ac48..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery-invert.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#FFFFFF"> - <path d="M15.3 14.7C16.1 10.9 14.7 4 12 4c-2.7 0-4.2 6.7-3.4 10.5L7 18h2.7l.3 1h4c.2-.3.1-.5.3-1H17l-1.7-3.3zM12 10c-.8 0-1.5-.7-1.5-1.5S11.2 7 12 7s1.5.7 1.5 1.5S12.8 10 12 10zm2 10c0 1.1-2 2-2 2s-2-.9-2-2"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png deleted file mode 100644 index 6d3c067..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg b/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg deleted file mode 100644 index c3f99d6..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/logo-wikimediaDiscovery.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <path d="M15.3 14.7C16.1 10.9 14.7 4 12 4c-2.7 0-4.2 6.7-3.4 10.5L7 18h2.7l.3 1h4c.2-.3.1-.5.3-1H17l-1.7-3.3zM12 10c-.8 0-1.5-.7-1.5-1.5S11.2 7 12 7s1.5.7 1.5 1.5S12.8 10 12 10zm2 10c0 1.1-2 2-2 2s-2-.9-2-2"/> -</svg> diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.png b/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.png deleted file mode 100644 index 46a180d..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.svg b/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.svg deleted file mode 100644 index 578f12b..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize-invert.svg +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#FFFFFF"> - <circle cx="11.5" cy="8.5" r="2.5"/> - <path d="M16.3 8.7L17 8l-.8-.8.4-.8-1.1-.5.1-.9-1.2-.2-.1-.9-1.2.2-.4-.8-1.1.5L11 3l-.8.8-.9-.4-.5 1.1-.9-.2-.2 1.2-.9.2.2 1.2-.9.4.5 1.1L6 9l.8.8-.4.8 1.1.5-.1.9 1.2.2.1.9 1.2-.2.4.8 1.1-.5.6.8.8-.8.8.4.5-1.1.9.1.2-1.2.9-.1-.2-1.2.8-.4-.4-1zM11.5 12C9.6 12 8 10.4 8 8.5S9.6 5 11.5 5 15 6.6 15 8.5 13.4 12 11.5 12zm.5 3l-.7-.7-1.1.6-.4-.7-.8.3V23l2.5-3 2.5 3v-8.5l-1-.5z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.png b/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.png deleted file mode 100644 index 1010574..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.svg b/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.svg deleted file mode 100644 index 45df8b7..0000000 --- a/resources/lib/oojs-ui/themes/apex/images/icons/ribbonPrize.svg +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <circle cx="11.5" cy="8.5" r="2.5"/> - <path d="M16.3 8.7L17 8l-.8-.8.4-.8-1.1-.5.1-.9-1.2-.2-.1-.9-1.2.2-.4-.8-1.1.5L11 3l-.8.8-.9-.4-.5 1.1-.9-.2-.2 1.2-.9.2.2 1.2-.9.4.5 1.1L6 9l.8.8-.4.8 1.1.5-.1.9 1.2.2.1.9 1.2-.2.4.8 1.1-.5.6.8.8-.8.8.4.5-1.1.9.1.2-1.2.9-.1-.2-1.2.8-.4-.4-1zM11.5 12C9.6 12 8 10.4 8 8.5S9.6 5 11.5 5 15 6.6 15 8.5 13.4 12 11.5 12zm.5 3l-.7-.7-1.1.6-.4-.7-.8.3V23l2.5-3 2.5 3v-8.5l-1-.5z"/> -</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json b/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json index 827a72e..f693e3f 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json @@ -23,8 +23,6 @@ }, "images": { "add": { "file": "images/icons/add.svg", "variants": [ "constructive", "progressive" ] }, - "beta": { "file": "images/icons/beta.svg", "deprecated": "Deprecated since v0.18.3, don't use." }, - "betaLaunch": { "file": "images/icons/logo-wikimediaDiscovery.svg", "deprecated": "Moved since v0.18.3, use 'logoWikimediaDiscovery' from the 'Wikimedia' pack instead." }, "bookmark": { "file": { "ltr": "images/icons/bookmark-ltr.svg", "rtl": "images/icons/bookmark-rtl.svg" @@ -67,7 +65,6 @@ "ltr": "images/icons/printer-ltr.svg", "rtl": "images/icons/printer-rtl.svg" } }, - "ribbonPrize": { "file": "images/icons/ribbonPrize.svg", "deprecated": "Deprecated since v0.18.3, don't use." }, "subtract": { "file": "images/icons/subtract.svg" }, "sun": { "file": { "ltr": "images/icons/sun-ltr.svg", diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json index b4acff1..0a1ccd7 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json @@ -23,10 +23,6 @@ }, "images": { "block": { "file": "images/icons/block.svg", "variants": [ "destructive" ] }, - "blockUndo": { "file": { - "ltr": "images/icons/unBlock-ltr.svg", - "rtl": "images/icons/unBlock-rtl.svg" - }, "deprecated": "Renamed since v0.18.3, use 'unBlock' instead." }, "unBlock": { "file": { "ltr": "images/icons/unBlock-ltr.svg", "rtl": "images/icons/unBlock-rtl.svg" @@ -39,10 +35,6 @@ "ltr": "images/icons/unFlag-ltr.svg", "rtl": "images/icons/unFlag-rtl.svg" } }, - "flagUndo": { "file": { - "ltr": "images/icons/unFlag-ltr.svg", - "rtl": "images/icons/unFlag-rtl.svg" - }, "deprecated": "Renamed since v0.18.3, use 'unFlag' instead." }, "lock": { "file": { "ltr": "images/icons/lock-ltr.svg", "rtl": "images/icons/lock-rtl.svg" @@ -62,10 +54,6 @@ "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" - }, "deprecated": "Renamed since v0.18.3, use 'unTrash' instead." }, "ongoingConversation": { "file": { "ltr": "images/icons/ongoingConversation-ltr.svg", diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json b/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json index 14f6b18..3bdecff 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json @@ -10,15 +10,6 @@ "progressive": { "color": "#36c", "global": true - }, - "constructive": { - "color": "#36c" - }, - "destructive": { - "color": "#d33" - }, - "warning": { - "color": "#ff5d00" } }, "images": { diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.png deleted file mode 100644 index c3b26b8..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg deleted file mode 100644 index eca628f..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#fff"> - <path d="M12 4c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 12l-3-2-1 4-1-4-3 2 2-3-4-1 4-1-2-3 3 2 1-4 1 4 3-2-2 3 4 1-4 1 2 3z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.png deleted file mode 100644 index 4c67bac..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.svg deleted file mode 100644 index ba896ef..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-progressive.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#36c"> - <path d="M12 4c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 12l-3-2-1 4-1-4-3 2 2-3-4-1 4-1-2-3 3 2 1-4 1 4 3-2-2 3 4 1-4 1 2 3z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.png deleted file mode 100644 index 7b31e1e..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.svg deleted file mode 100644 index 51a5c78..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/beta.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <path d="M12 4c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm4 12l-3-2-1 4-1-4-3 2 2-3-4-1 4-1-2-3 3 2 1-4 1 4 3-2-2 3 4 1-4 1 2 3z"/> -</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.png deleted file mode 100644 index 46a180d..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.svg deleted file mode 100644 index 640d263..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-invert.svg +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#fff"> - <circle cx="11.5" cy="8.5" r="2.5"/> - <path d="M16.3 8.7L17 8l-.8-.8.4-.8-1.1-.5.1-.9-1.2-.2-.1-.9-1.2.2-.4-.8-1.1.5L11 3l-.8.8-.9-.4-.5 1.1-.9-.2-.2 1.2-.9.2.2 1.2-.9.4.5 1.1L6 9l.8.8-.4.8 1.1.5-.1.9 1.2.2.1.9 1.2-.2.4.8 1.1-.5.6.8.8-.8.8.4.5-1.1.9.1.2-1.2.9-.1-.2-1.2.8-.4-.4-1zM11.5 12C9.6 12 8 10.4 8 8.5S9.6 5 11.5 5 15 6.6 15 8.5 13.4 12 11.5 12zm.5 3l-.7-.7-1.1.6-.4-.7-.8.3V23l2.5-3 2.5 3v-8.5l-1-.5z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.png deleted file mode 100644 index 79effe1..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.svg deleted file mode 100644 index c0aa287..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize-progressive.svg +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><g fill="#36c"> - <circle cx="11.5" cy="8.5" r="2.5"/> - <path d="M16.3 8.7L17 8l-.8-.8.4-.8-1.1-.5.1-.9-1.2-.2-.1-.9-1.2.2-.4-.8-1.1.5L11 3l-.8.8-.9-.4-.5 1.1-.9-.2-.2 1.2-.9.2.2 1.2-.9.4.5 1.1L6 9l.8.8-.4.8 1.1.5-.1.9 1.2.2.1.9 1.2-.2.4.8 1.1-.5.6.8.8-.8.8.4.5-1.1.9.1.2-1.2.9-.1-.2-1.2.8-.4-.4-1zM11.5 12C9.6 12 8 10.4 8 8.5S9.6 5 11.5 5 15 6.6 15 8.5 13.4 12 11.5 12zm.5 3l-.7-.7-1.1.6-.4-.7-.8.3V23l2.5-3 2.5 3v-8.5l-1-.5z"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.png deleted file mode 100644 index 1010574..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.svg deleted file mode 100644 index 45df8b7..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/ribbonPrize.svg +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <circle cx="11.5" cy="8.5" r="2.5"/> - <path d="M16.3 8.7L17 8l-.8-.8.4-.8-1.1-.5.1-.9-1.2-.2-.1-.9-1.2.2-.4-.8-1.1.5L11 3l-.8.8-.9-.4-.5 1.1-.9-.2-.2 1.2-.9.2.2 1.2-.9.4.5 1.1L6 9l.8.8-.4.8 1.1.5-.1.9 1.2.2.1.9 1.2-.2.4.8 1.1-.5.6.8.8-.8.8.4.5-1.1.9.1.2-1.2.9-.1-.2-1.2.8-.4-.4-1zM11.5 12C9.6 12 8 10.4 8 8.5S9.6 5 11.5 5 15 6.6 15 8.5 13.4 12 11.5 12zm.5 3l-.7-.7-1.1.6-.4-.7-.8.3V23l2.5-3 2.5 3v-8.5l-1-.5z"/> -</svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.png deleted file mode 100644 index fa85ac3..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.svg deleted file mode 100644 index 900e477..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-progressive.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <path d="M6 12A6 6 0 1 1 6 0a6 6 0 0 1 0 12zM5 7h2V2H5zm0 3h2V8H5z" id="alert"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.png deleted file mode 100644 index 3539c88..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.svg deleted file mode 100644 index 511359a..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="down"> - <path id="arrow" d="M1 4h10L6 9 1 4"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.png deleted file mode 100644 index 7d50f19..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.svg deleted file mode 100644 index fc6cb9a..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="ltr"> - <path id="arrow" d="M4 1v10l5-5-5-5"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.png deleted file mode 100644 index 27bfa29..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.svg deleted file mode 100644 index 8f1a254..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="rtl"> - <path id="arrow" d="M8 11V1L3 6l5 5"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.png deleted file mode 100644 index 521e438..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.svg deleted file mode 100644 index 4e9221a..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="up"> - <path id="arrow" d="M1 8h10L6 3 1 8"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.png deleted file mode 100644 index 325dbeb..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.svg deleted file mode 100644 index 4ea1013..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="clear"> - <path id="circle-with-cross" d="M6 0C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM3.5 2.5L6 5l2.5-2.5 1 1L7 6l2.5 2.5-1 1L6 7 3.5 9.5l-1-1L5 6 2.5 3.5z"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.png deleted file mode 100644 index 01e84e6..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.svg deleted file mode 100644 index ab95a3d..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-progressive.svg +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <path d="M5 1h2v10H5zm4.83 1.634l1 1.732-8.66 5-1-1.732zM1.17 4.366l1-1.732 8.66 5-1 1.732z" id="required"/> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.png deleted file mode 100644 index 84c7dbc..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.svg deleted file mode 100644 index 5e8e395..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="search"> - <path id="magnifying-glass" d="M10.37 9.474L7.994 7.1l-.17-.1a3.45 3.45 0 0 0 .644-2.01A3.478 3.478 0 1 0 4.99 8.47c.75 0 1.442-.24 2.01-.648l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27a2.21 2.21 0 1 1 2.21-2.21A2.21 2.21 0 0 1 4.99 7.21z"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.png deleted file mode 100644 index 0207a8b..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.png +++ /dev/null Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.svg deleted file mode 100644 index 015d02e..0000000 --- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-progressive.svg +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12 12"><g fill="#36c"> - <g id="search"> - <path id="magnifying-glass" d="M1.63 9.474L4.006 7.1l.17-.1a3.45 3.45 0 0 1-.644-2.01A3.478 3.478 0 1 1 7.01 8.47 3.43 3.43 0 0 1 5 7.822l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27A2.21 2.21 0 1 0 4.8 4.994 2.21 2.21 0 0 0 7.01 7.21z"/> - </g> -</g></svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/indicators.json b/resources/lib/oojs-ui/themes/mediawiki/indicators.json index 91d0358..df32417 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/indicators.json +++ b/resources/lib/oojs-ui/themes/mediawiki/indicators.json @@ -8,8 +8,7 @@ "global": true }, "progressive": { - "color": "#36c", - "global": true + "color": "#36c" }, "constructive": { "color": "#36c" -- To view, visit https://gerrit.wikimedia.org/r/342867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10ef5d85fcfae3a0b22b07a8a5ed3ae3e2d51288 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: VolkerE <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
