Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/222165
Change subject: Update OOjs UI to v0.11.7 ...................................................................... Update OOjs UI to v0.11.7 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.7/History.md Change-Id: I0b78334f118ff351277652a5af0d240ef262769c --- M composer.json M resources/lib/oojs-ui/i18n/eu.json M resources/lib/oojs-ui/i18n/fi.json A resources/lib/oojs-ui/i18n/hrx.json M resources/lib/oojs-ui/i18n/ku-latn.json M resources/lib/oojs-ui/i18n/nb.json M resources/lib/oojs-ui/i18n/sv.json M resources/lib/oojs-ui/i18n/yue.json M resources/lib/oojs-ui/oojs-ui-apex-noimages.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg 17 files changed, 244 insertions(+), 124 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/222165/1 diff --git a/composer.json b/composer.json index f72e7e4..929b3e5 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "leafo/lessphp": "0.5.0", "liuggio/statsd-php-client": "1.0.12", "mediawiki/at-ease": "1.0.0", - "oojs/oojs-ui": "0.11.6", + "oojs/oojs-ui": "0.11.7", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/cdb": "1.0.1", diff --git a/resources/lib/oojs-ui/i18n/eu.json b/resources/lib/oojs-ui/i18n/eu.json index d6a06bb..fe6e997 100644 --- a/resources/lib/oojs-ui/i18n/eu.json +++ b/resources/lib/oojs-ui/i18n/eu.json @@ -4,17 +4,20 @@ "An13sa", "Unai Fdz. de Betoño", "Xabier Armendaritz", - "Subi" + "Subi", + "Sator" ] }, "ooui-outline-control-move-down": "Mugitu itema beherantz", "ooui-outline-control-move-up": "Mugitu itema gorantz", + "ooui-outline-control-remove": "Elementua kendu", "ooui-toolbar-more": "Gehiago", "ooui-toolgroup-expand": "Gehiago", "ooui-toolgroup-collapse": "Gutxiago", "ooui-dialog-message-accept": "Ados", "ooui-dialog-message-reject": "Utzi", "ooui-dialog-process-error": "Zerbaitek huts egin du", + "ooui-dialog-process-dismiss": "Utzi", "ooui-dialog-process-retry": "Saiatu berriro", "ooui-dialog-process-continue": "Jarraitu", "ooui-selectfile-placeholder": "Ez da fitxategirik hautatu" diff --git a/resources/lib/oojs-ui/i18n/fi.json b/resources/lib/oojs-ui/i18n/fi.json index 3fb4110..d00254c 100644 --- a/resources/lib/oojs-ui/i18n/fi.json +++ b/resources/lib/oojs-ui/i18n/fi.json @@ -27,5 +27,7 @@ "ooui-dialog-process-error": "Jokin meni pieleen", "ooui-dialog-process-dismiss": "Hylkää", "ooui-dialog-process-retry": "Yritä uudelleen", - "ooui-dialog-process-continue": "Jatka" + "ooui-dialog-process-continue": "Jatka", + "ooui-selectfile-not-supported": "Tiedoston valitsemista ei tueta", + "ooui-selectfile-placeholder": "Tiedostoa ei ole valittu" } diff --git a/resources/lib/oojs-ui/i18n/hrx.json b/resources/lib/oojs-ui/i18n/hrx.json new file mode 100644 index 0000000..1534af7 --- /dev/null +++ b/resources/lib/oojs-ui/i18n/hrx.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Midnight Gambler" + ] + }, + "ooui-toolbar-more": "Meahr", + "ooui-toolgroup-expand": "Meahr", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Abbreche", + "ooui-dialog-process-dismiss": "Ausblenne" +} diff --git a/resources/lib/oojs-ui/i18n/ku-latn.json b/resources/lib/oojs-ui/i18n/ku-latn.json index a2bdbd5..94b4687 100644 --- a/resources/lib/oojs-ui/i18n/ku-latn.json +++ b/resources/lib/oojs-ui/i18n/ku-latn.json @@ -11,5 +11,6 @@ "ooui-dialog-message-accept": "Baş e", "ooui-dialog-message-reject": "Betal bike", "ooui-dialog-process-retry": "Dîsa hewl bide", - "ooui-dialog-process-continue": "Bidomîne" + "ooui-dialog-process-continue": "Bidomîne", + "ooui-selectfile-placeholder": "Ti dosye nehatiye hilbijartin" } diff --git a/resources/lib/oojs-ui/i18n/nb.json b/resources/lib/oojs-ui/i18n/nb.json index 9e77392..9e2d8f2 100644 --- a/resources/lib/oojs-ui/i18n/nb.json +++ b/resources/lib/oojs-ui/i18n/nb.json @@ -21,5 +21,6 @@ "ooui-dialog-process-error": "Noe gikk galt", "ooui-dialog-process-dismiss": "Lukk", "ooui-dialog-process-retry": "Prøv igjen", - "ooui-dialog-process-continue": "Fortsett" + "ooui-dialog-process-continue": "Fortsett", + "ooui-selectfile-placeholder": "Ingen fil er valgt" } diff --git a/resources/lib/oojs-ui/i18n/sv.json b/resources/lib/oojs-ui/i18n/sv.json index d499427..c2422ba 100644 --- a/resources/lib/oojs-ui/i18n/sv.json +++ b/resources/lib/oojs-ui/i18n/sv.json @@ -25,5 +25,6 @@ "ooui-dialog-process-error": "Något gick fel", "ooui-dialog-process-dismiss": "Stäng", "ooui-dialog-process-retry": "Försök igen", - "ooui-dialog-process-continue": "Fortsätt" + "ooui-dialog-process-continue": "Fortsätt", + "ooui-selectfile-placeholder": "Ingen fil är vald" } diff --git a/resources/lib/oojs-ui/i18n/yue.json b/resources/lib/oojs-ui/i18n/yue.json index 81ad9a9..d328e6e 100644 --- a/resources/lib/oojs-ui/i18n/yue.json +++ b/resources/lib/oojs-ui/i18n/yue.json @@ -1,16 +1,21 @@ { "@metadata": { "authors": [ - "Deryck Chan" + "Deryck Chan", + "William915" ] }, "ooui-outline-control-move-down": "向下搬", "ooui-outline-control-move-up": "向上搬", "ooui-outline-control-remove": "拎走", "ooui-toolbar-more": "仲有...", + "ooui-toolgroup-expand": "更多", "ooui-dialog-message-accept": "好", "ooui-dialog-message-reject": "取消", "ooui-dialog-process-error": "唔對路", "ooui-dialog-process-dismiss": "閂咗佢", - "ooui-dialog-process-retry": "再試過" + "ooui-dialog-process-retry": "再試過", + "ooui-dialog-process-continue": "繼續", + "ooui-selectfile-not-supported": "未有文件選擇功能", + "ooui-selectfile-placeholder": "無揀到文件" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index dcdf950..37c88af 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.11.6 + * OOjs UI v0.11.7 * 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-06-23T21:49:41Z + * Date: 2015-07-01T19:04:35Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -1111,12 +1111,24 @@ border: none; background: none; } -.oo-ui-toolbar-actions > .oo-ui-buttonElement { +.oo-ui-toolbar-actions > .oo-ui-buttonElement-framed, +.oo-ui-toolbar-actions > .oo-ui-buttonElement-framed:last-child { margin-top: 0.4em; margin-bottom: 0.4em; -} -.oo-ui-toolbar-actions > .oo-ui-buttonElement:last-child { margin-right: 0.5em; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement, +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless:last-child.oo-ui-labelElement { + margin: 0; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button, +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless:last-child.oo-ui-labelElement > .oo-ui-buttonElement-button { + margin: 0; + padding: 1.1953125em 0.3125em; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label, +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless:last-child.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { + margin: 0 1em; } .oo-ui-toolbar-shadow { background-image: /* @embed */ url(themes/apex/images/toolbar-shadow.png); @@ -2531,12 +2543,25 @@ .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.75em 0 0.75em 0.75em; + margin: 0.75em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button { padding: 0 1em; + vertical-align: middle; + /* Adjust for border so text aligns with title */ + margin: -1px; +} +.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; +} +.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, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button { + padding: 0.75em 1em; vertical-align: middle; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:hover, @@ -2546,15 +2571,6 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); -} -.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed, -.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed { - margin: 0.75em; -} -.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, -.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button { - /* Adjust for border so text aligns with title */ - margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggedElement-progressive:hover, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggedElement-progressive:hover { @@ -2584,6 +2600,9 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggedElement-destructive:active { background-color: rgba(212, 83, 83, 0.1); } +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement { + margin-right: 0; +} .oo-ui-processDialog > .oo-ui-window-frame { min-height: 5em; } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 3212616..a9756a1 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.11.6 + * OOjs UI v0.11.7 * 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-06-23T21:49:33Z + * Date: 2015-07-01T19:04:28Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index 64b9827..30b58e6 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.6 + * OOjs UI v0.11.7 * 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-06-23T21:49:41Z + * Date: 2015-07-01T19:04:35Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -125,77 +125,90 @@ width: 1.875em; height: 1.875em; } -.oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button:focus { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ) > .oo-ui-buttonElement-button:focus { box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.2); outline: none; } -.oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button .oo-ui-indicatorElement-indicator { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ) > .oo-ui-buttonElement-button .oo-ui-indicatorElement-indicator { margin-right: 0; } -.oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { margin-left: 0.25em; margin-right: 0.25em; } -.oo-ui-buttonElement-frameless > input.oo-ui-buttonElement-button { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ) > input.oo-ui-buttonElement-button { padding-left: 0.25em; padding-right: 0.25em; color: #333333; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled > input.oo-ui-buttonElement-button, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled > input.oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #555555; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > input.oo-ui-buttonElement-button, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-buttonElement-pressed > input.oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #444444; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { color: #347bff; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #777777; } -.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 { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).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:not( .oo-ui-flaggedElement-primary ).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: #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, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { color: #00af89; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #777777; } -.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 { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).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:not( .oo-ui-flaggedElement-primary ).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; box-shadow: none; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label { color: #d11d13; } -.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { color: #777777; } -.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 { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).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:not( .oo-ui-flaggedElement-primary ).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: #73100a; box-shadow: none; } -.oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-disabled > .oo-ui-buttonElement-button { color: #cccccc; } -.oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, -.oo-ui-buttonElement-frameless.oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, +.oo-ui-buttonElement-frameless:not( .oo-ui-flaggedElement-primary ).oo-ui-widget-disabled > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { opacity: 0.2; } .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button { margin: 0.1em 0; padding: 0.2em 0.8em; border-radius: 2px; +} +.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.875em; +} +.oo-ui-buttonElement-framed.oo-ui-widget-disabled > .oo-ui-buttonElement-button { + border: 1px solid #dddddd; +} +.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button { + border: 1px solid #cdcdcd; +} +.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary > .oo-ui-buttonElement-button { -webkit-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out; -moz-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out; -ms-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out; @@ -203,188 +216,232 @@ transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out; } .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:hover, -.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:focus { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary > .oo-ui-buttonElement-button:focus { outline: none; } -.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.875em; -} -.oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { margin-left: -0.5em; margin-right: -0.5em; } -.oo-ui-buttonElement-framed.oo-ui-iconElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { +.oo-ui-buttonElement-framed.oo-ui-iconElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-iconElement.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon { margin-right: 0.3em; } -.oo-ui-buttonElement-framed.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { +.oo-ui-buttonElement-framed.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-indicatorElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { /* -0.5 - 0.475 */ margin-left: -0.005em; margin-right: -0.005em; } .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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-indicatorElement.oo-ui-iconElement:not( .oo-ui-labelElement ) > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator { margin-left: 0.46875em; margin-right: -0.275em; } -.oo-ui-buttonElement-framed.oo-ui-widget-disabled > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-disabled > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-disabled > .oo-ui-buttonElement-button { color: #ffffff; background: #dddddd; - border: 1px solid #dddddd; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled > .oo-ui-buttonElement-button { color: #555555; background-color: #ffffff; - border: 1px solid #cdcdcd; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled > .oo-ui-buttonElement-button:hover { background-color: #ebebeb; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { color: #347bff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus { 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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { color: #00af89; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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); } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus { 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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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; 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { color: #d11d13; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus { 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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button { color: #ffffff; background-color: #347bff; border-color: #347bff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus { 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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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: #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 { +.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { color: #ffffff; background-color: #00af89; border-color: #00af89; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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; } .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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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; 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 { +.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { color: #ffffff; background-color: #d11d13; border-color: #d11d13; } -.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover { 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 { +.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus { 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 { +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.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: #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 { +.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, +.oo-ui-buttonElement-frameless.oo-ui-flaggedElement-primary.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button { background-color: #999999; color: #ffffff; } @@ -1165,13 +1222,20 @@ background: none; box-shadow: none; } -.oo-ui-toolbar-actions > .oo-ui-buttonElement { +.oo-ui-toolbar-actions > .oo-ui-buttonElement-framed, +.oo-ui-toolbar-actions > .oo-ui-buttonElement-framed:last-child { margin-top: 0.25em; margin-bottom: 0.25em; -} -.oo-ui-toolbar-actions > .oo-ui-toolbar, -.oo-ui-toolbar-actions > .oo-ui-buttonElement:last-child { margin-right: 0.5em; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement { + margin: 0; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button { + padding: 1.0546875em 0.3125em; +} +.oo-ui-toolbar-actions > .oo-ui-buttonElement-frameless.oo-ui-labelElement > .oo-ui-buttonElement-button > .oo-ui-labelElement-label { + margin: 0 1em; } .oo-ui-optionWidget { position: relative; @@ -2712,12 +2776,25 @@ .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.75em 0 0.75em 0.75em; + margin: 0.75em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button { padding: 0 1em; + vertical-align: middle; + /* Adjust for border so text aligns with title */ + margin: -1px; +} +.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; +} +.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, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button { + padding: 0.75em 1em; vertical-align: middle; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:hover, @@ -2727,15 +2804,6 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); -} -.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed, -.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed { - margin: 0.75em; -} -.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button, -.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonElement-framed .oo-ui-buttonElement-button { - /* Adjust for border so text aligns with title */ - margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggedElement-progressive:hover, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggedElement-progressive:hover { @@ -2765,6 +2833,9 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggedElement-destructive:active { background-color: rgba(212, 83, 83, 0.1); } +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonElement { + margin-right: 0; +} .oo-ui-processDialog > .oo-ui-window-frame { min-height: 5em; } diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 15cffdc..b20b5c9 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.6 + * OOjs UI v0.11.7 * 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-06-23T21:49:33Z + * Date: 2015-07-01T19:04:28Z */ /** * @class @@ -44,7 +44,10 @@ if ( element.supports( [ 'hasFlag' ] ) ) { isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed(); - if ( isFramed && ( element.isDisabled() || element.hasFlag( 'primary' ) ) ) { + if ( + ( isFramed && ( element.isDisabled() || element.hasFlag( 'primary' ) ) ) || + ( !isFramed && element.hasFlag( 'primary' ) ) + ) { variants.invert = true; } else { variants.progressive = element.hasFlag( 'progressive' ); diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 218acf3..b53a88e 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.6 + * OOjs UI v0.11.7 * 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-06-23T21:49:33Z + * Date: 2015-07-01T19:04:28Z */ ( function ( OO ) { @@ -11517,7 +11517,8 @@ /** * OutlineControlsWidget is a set of controls for an {@link OO.ui.OutlineSelectWidget outline select widget}. * Controls include moving items up and down, removing items, and adding different kinds of items. - * ####Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.#### + * + * **Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.** * * @class * @extends OO.ui.Widget @@ -14707,6 +14708,7 @@ this.$element .data( 'oo-ui-optionWidget', this ) .attr( 'role', 'option' ) + .attr( 'aria-selected', 'false' ) .addClass( 'oo-ui-optionWidget' ) .append( this.$label ); }; @@ -17258,7 +17260,7 @@ * OutlineSelectWidget is a structured list that contains {@link OO.ui.OutlineOptionWidget outline options} * A set of controls can be provided with an {@link OO.ui.OutlineControlsWidget outline controls} widget. * - * ####Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.#### + * **Currently, this class is only used by {@link OO.ui.BookletLayout booklet layouts}.** * * @class * @extends OO.ui.SelectWidget @@ -17292,7 +17294,7 @@ /** * TabSelectWidget is a list that contains {@link OO.ui.TabOptionWidget tab options} * - * ####Currently, this class is only used by {@link OO.ui.IndexLayout index layouts}.#### + * **Currently, this class is only used by {@link OO.ui.IndexLayout index layouts}.** * * @class * @extends OO.ui.SelectWidget diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png index bc9d4fd..74cf62b 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg index 33fb468..855b7b8 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.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: #FFFFFF }</style> - <path d="M20 14.5v-2.9l-1.8-.3c-.1-.4-.3-.8-.6-1.4l1.1-1.5-2.1-2.1-1.5 1.1c-.5-.3-1-.5-1.4-.6L13.5 5h-2.9l-.3 1.8c-.5.1-.9.3-1.4.6L7.4 6.3 5.3 8.4l1 1.5c-.3.5-.4.9-.6 1.4l-1.7.2v2.9l1.8.3c.1.5.3.9.6 1.4l-1 1.5 2.1 2.1 1.5-1c.4.2.9.4 1.4.6l.3 1.8h3l.3-1.8c.5-.1.9-.3 1.4-.6l1.5 1.1 2.1-2.1-1.1-1.5c.3-.5.5-1 .6-1.4l1.5-.3zM12 16c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3-1.3 3-3 3z"/> + <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087 1.5-.995c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.098.9-.297 1.4-.595l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/> </svg> diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png index 6c1a068..c486b98 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png Binary files differ diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg index 3159624..cdf07b2 100644 --- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg +++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.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"> - <path d="M20 14.5v-2.9l-1.8-.3c-.1-.4-.3-.8-.6-1.4l1.1-1.5-2.1-2.1-1.5 1.1c-.5-.3-1-.5-1.4-.6L13.5 5h-2.9l-.3 1.8c-.5.1-.9.3-1.4.6L7.4 6.3 5.3 8.4l1 1.5c-.3.5-.4.9-.6 1.4l-1.7.2v2.9l1.8.3c.1.5.3.9.6 1.4l-1 1.5 2.1 2.1 1.5-1c.4.2.9.4 1.4.6l.3 1.8h3l.3-1.8c.5-.1.9-.3 1.4-.6l1.5 1.1 2.1-2.1-1.1-1.5c.3-.5.5-1 .6-1.4l1.5-.3zM12 16c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3-1.3 3-3 3z"/> + <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087 1.5-.995c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.098.9-.297 1.4-.595l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/> </svg> -- To view, visit https://gerrit.wikimedia.org/r/222165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b78334f118ff351277652a5af0d240ef262769c 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
