From: James D. Forrester Date: Tue, 12 May 2015 12:26:13 +0000 (+0100) Subject: Update OOjs UI to v0.11.3 X-Git-Tag: 1.31.0-rc.0~11430 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=6c98f7d1c63110e88198f701ed37b2ed424fcb17;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.11.3 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.3/History.md Change-Id: I3b1ffc8fd346bb6cc8f1029f64e4855afa1db168 --- diff --git a/composer.json b/composer.json index da6d3344fa..0789eee02a 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "ext-iconv": "*", "leafo/lessphp": "0.5.0", "liuggio/statsd-php-client": "1.0.12", - "oojs/oojs-ui": "0.11.2", + "oojs/oojs-ui": "0.11.3", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/cdb": "1.0.1", diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index a3566c61bb..12e80c11b3 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.2 + * OOjs UI v0.11.3 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-05-11T17:24:34Z + * Date: 2015-05-12T12:15:44Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -151,7 +151,7 @@ } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - color: #2962cc; + color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, @@ -163,7 +163,7 @@ } .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: #008c6d; + color: #005946; box-shadow: none; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, @@ -175,7 +175,7 @@ } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label, .oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { - color: #a7170f; + color: #73100a; box-shadow: none; } .oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button { @@ -231,15 +231,15 @@ border: 1px solid #cdcdcd; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 rgba(0, 0, 0, 0.2), 0 0.1em 0 0 rgba(0, 0, 0, 0.2); + background-color: #ebebeb; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2); } .oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { - background-color: #d0d0d0; - border-color: #d0d0d0; + background-color: #d9d9d9; + border-color: #d9d9d9; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -250,17 +250,17 @@ color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #2962cc, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #2962cc; + 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-progressive > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #2962cc; - border-color: #2962cc; + box-shadow: inset 0 0 0 1px #1f4999; + border-color: #1f4999; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { - color: #2962cc; - border-color: #d0d0d0; + color: #1f4999; + border-color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -271,17 +271,17 @@ color: #00af89; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #008c6d, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #008c6d; + background-color: rgba(0, 171, 137, 0.1); + border-color: rgba(0, 89, 70, 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 #008c6d; - border-color: #008c6d; + box-shadow: inset 0 0 0 1px #005946; + border-color: #005946; } .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: #008c6d; - border-color: #d0d0d0; + color: #005946; + border-color: #005946; 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 { @@ -292,17 +292,17 @@ color: #d11d13; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #a7170f, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #a7170f; + background-color: rgba(209, 29, 19, 0.1); + border-color: rgba(115, 16, 10, 0.5); } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #a7170f; - border-color: #a7170f; + box-shadow: inset 0 0 0 1px #73100a; + border-color: #73100a; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { - color: #a7170f; - border-color: #d0d0d0; + color: #73100a; + border-color: #73100a; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -315,18 +315,18 @@ border-color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #2962cc, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #2962cc; + background: #2962cc; + border-color: #2962cc; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #2962cc; - border-color: #2962cc; + box-shadow: inset 0 0 0 1px #ffffff; + border-color: #347bff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #ffffff; - background-color: #2962cc; - border-color: #2962cc; + background-color: #1f4999; + border-color: #1f4999; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -339,18 +339,18 @@ border-color: #00af89; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #008c6d, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #008c6d; + background: #008064; + border-color: #008064; } .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 #008c6d; - border-color: #008c6d; + box-shadow: inset 0 0 0 1px #ffffff; + border-color: #00af89; } .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: #008c6d; - border-color: #008c6d; + background-color: #005946; + border-color: #005946; 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 { @@ -363,18 +363,18 @@ border-color: #d11d13; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { - box-shadow: inset 0 -0.2em 0 0 #a7170f, 0 0.1em 0 0 rgba(0, 0, 0, 0.1); - border-bottom-color: #a7170f; + background: #8c130d; + border-color: #8c130d; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus { - box-shadow: inset 0 0 0 1px #a7170f; - border-color: #a7170f; + box-shadow: inset 0 0 0 1px #ffffff; + border-color: #d11d13; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled .oo-ui-buttonElement-button:active, .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { color: #ffffff; - background-color: #a7170f; - border-color: #a7170f; + background-color: #73100a; + border-color: #73100a; box-shadow: none; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { @@ -771,13 +771,13 @@ .oo-ui-toolGroup .oo-ui-toolGroup .oo-ui-widget-enabled { border-right: none !important; } -.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { - color: #000000; -} .oo-ui-barToolGroup > .oo-ui-iconElement-icon, .oo-ui-barToolGroup > .oo-ui-labelElement-label { display: none; } +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link { + cursor: pointer; +} .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool { display: inline-block; position: relative; @@ -790,17 +790,18 @@ display: none; } .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-iconElement > .oo-ui-tool-link .oo-ui-iconElement-icon { - display: block; + display: inline-block; + vertical-align: top; } .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-iconElement > .oo-ui-tool-link .oo-ui-tool-title { display: none; } +.oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-iconElement.oo-ui-tool-with-label > .oo-ui-tool-link .oo-ui-tool-title { + display: inline; +} .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link { cursor: default; } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link { - cursor: pointer; -} .oo-ui-barToolGroup > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link { height: 1.875em; padding: 0.625em; @@ -817,6 +818,9 @@ border-color: rgba(0, 0, 0, 0.2); background-color: #eeeeee; } +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title { + color: #555555; +} .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled { border-color: rgba(0, 0, 0, 0.2); box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07); @@ -828,10 +832,13 @@ .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled + .oo-ui-tool-active.oo-ui-widget-enabled { border-left-color: rgba(0, 0, 0, 0.1); } +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-tool-title { + color: #cccccc; +} .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.2; } -.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled .oo-ui-iconElement-icon { +.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled > .oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.7; } .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:hover > .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -840,7 +847,10 @@ .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:active { background-color: #e7e7e7; } -.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link .oo-ui-iconElement-icon { +.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title { + color: #cccccc; +} +.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-iconElement-icon { opacity: 0.2; } .oo-ui-popupToolGroup { @@ -993,6 +1003,7 @@ } .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { padding-left: 0.5em; + color: #000000; } .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { @@ -1150,6 +1161,7 @@ .oo-ui-toolbar-bar .oo-ui-toolbar-bar { border: none; background: none; + box-shadow: none; } .oo-ui-toolbar-actions > .oo-ui-buttonElement { margin-top: 0.25em; @@ -1159,12 +1171,6 @@ .oo-ui-toolbar-actions > .oo-ui-buttonElement:last-child { margin-right: 0.5em; } -.oo-ui-toolbar-shadow { - background-image: /* @embed */ url(themes/mediawiki/images/toolbar-shadow.png); - bottom: -9px; - height: 9px; - opacity: 0.5; -} .oo-ui-optionWidget { position: relative; display: block; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 183fe8e6af..eaca1f15a8 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.11.2 + * OOjs UI v0.11.3 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-05-11T17:24:27Z + * Date: 2015-05-12T12:15:37Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index f881a12aba..9692d5cfac 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.2 + * OOjs UI v0.11.3 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-05-11T17:24:27Z + * Date: 2015-05-12T12:15:37Z */ ( function ( OO ) { @@ -6489,6 +6489,7 @@ OO.ui.Tool = function OoUiTool( toolGroup, config ) { 'oo-ui-tool ' + 'oo-ui-tool-name-' + this.constructor.static.name.replace( /^([^\/]+)\/([^\/]+).*$/, '$1-$2' ) ) + .toggleClass( 'oo-ui-tool-with-label', this.constructor.static.displayBothIconAndLabel ) .append( this.$link ); this.setTitle( config.title || this.constructor.static.title ); }; @@ -6549,6 +6550,16 @@ OO.ui.Tool.static.group = ''; */ OO.ui.Tool.static.title = ''; +/** + * Whether this tool should be displayed with both title and label when used in a bar tool group. + * Normally only the icon is displayed, or only the label if no icon is given. + * + * @static + * @inheritable + * @property {boolean} + */ +OO.ui.Tool.static.displayBothIconAndLabel = false; + /** * Tool can be automatically added to catch-all groups. * @@ -10791,6 +10802,9 @@ OO.ui.ToolGroupTool = function OoUiToolGroupTool( toolGroup, config ) { // Properties this.innerToolGroup = this.createGroup( this.constructor.static.groupConfig ); + // Events + this.innerToolGroup.connect( this, { disable: 'onToolGroupDisable' } ); + // Initialization this.$link.remove(); this.$element @@ -10823,6 +10837,16 @@ OO.ui.ToolGroupTool.prototype.onSelect = function () { return false; }; +/** + * Synchronize disabledness state of the tool with the inner toolgroup. + * + * @private + * @param {boolean} disabled Element is disabled + */ +OO.ui.ToolGroupTool.prototype.onToolGroupDisable = function ( disabled ) { + this.setDisabled( disabled ); +}; + /** * Handle the toolbar state being updated. * diff --git a/resources/lib/oojs-ui/themes/mediawiki/icons.json b/resources/lib/oojs-ui/themes/mediawiki/icons.json index 948ae6c7d6..d385eb11f6 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/icons.json +++ b/resources/lib/oojs-ui/themes/mediawiki/icons.json @@ -65,7 +65,7 @@ "rtl": "images/icons/search-rtl.svg" } }, "settings": { "file": "images/icons/settings.svg" }, - "tag": { "file": "images/icons/tag.svg" }, + "tag": { "file": "images/icons/tag.svg", "variants": [ "destructive", "warning", "constructive", "progressive" ] }, "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/images/icons/quotes-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png index 7060db71b3..ffe3601d20 100644 Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg index dc1c06f052..b3b923e557 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg @@ -1,6 +1,11 @@ - - - - - - + + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png index df0facfa78..a2acf5e943 100644 Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg index 3a8b70127a..b40a8ac9b2 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg @@ -1,6 +1,11 @@ - - - - - - + + + + + + + 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 new file mode 100644 index 0000000000..66af3753d7 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.png 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 new file mode 100644 index 0000000000..82171db6dd --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.png new file mode 100644 index 0000000000..1de90d48b4 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg new file mode 100644 index 0000000000..3d485128c6 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.png new file mode 100644 index 0000000000..a6759e21ed Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg new file mode 100644 index 0000000000..f52e06cea5 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.png new file mode 100644 index 0000000000..77fc366a47 Binary files /dev/null and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.png differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg new file mode 100644 index 0000000000..337adb6390 --- /dev/null +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg @@ -0,0 +1,6 @@ + + + + + +