jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.6.0 ......................................................................
Update OOjs UI to v0.6.0 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.6.0/History.md Local changes to ve.ui.FormatTool.css to compensate. Change-Id: I69622a4dbfc158ad0a3a595d907714f770af910e --- M lib/oojs-ui/i18n/nds-nl.json M lib/oojs-ui/i18n/sl.json M lib/oojs-ui/i18n/uk.json M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.svg.css M lib/oojs-ui/oojs-ui-apex.svg.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.svg.css M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css M lib/oojs-ui/oojs-ui.js M src/ui/styles/tools/ve.ui.FormatTool.css 15 files changed, 335 insertions(+), 402 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/i18n/nds-nl.json b/lib/oojs-ui/i18n/nds-nl.json index 26171f1..d3db318 100644 --- a/lib/oojs-ui/i18n/nds-nl.json +++ b/lib/oojs-ui/i18n/nds-nl.json @@ -5,5 +5,15 @@ ] }, "ooui-outline-control-move-down": "Onderwarp ummeneer zetten", - "ooui-outline-control-move-up": "Onderwarp umhoge zetten" + "ooui-outline-control-move-up": "Onderwarp umhoge zetten", + "ooui-outline-control-remove": "Element vortdoon", + "ooui-toolbar-more": "Meer", + "ooui-toolgroup-expand": "Meer", + "ooui-toolgroup-collapse": "Minder", + "ooui-dialog-message-accept": "Okee", + "ooui-dialog-message-reject": "Aofbreken", + "ooui-dialog-process-error": "Der gung iets fout", + "ooui-dialog-process-dismiss": "Sluten", + "ooui-dialog-process-retry": "Opniej proberen", + "ooui-dialog-process-continue": "Deurgaon" } diff --git a/lib/oojs-ui/i18n/sl.json b/lib/oojs-ui/i18n/sl.json index 5737548..a40728a 100644 --- a/lib/oojs-ui/i18n/sl.json +++ b/lib/oojs-ui/i18n/sl.json @@ -11,9 +11,12 @@ "ooui-outline-control-move-up": "Prestavi predmet višje", "ooui-outline-control-remove": "Odstrani vnos", "ooui-toolbar-more": "Več", + "ooui-toolgroup-expand": "Več", + "ooui-toolgroup-collapse": "Manj", "ooui-dialog-message-accept": "V redu", "ooui-dialog-message-reject": "Prekliči", "ooui-dialog-process-error": "Nekaj je šlo narobe", "ooui-dialog-process-dismiss": "Skrij", - "ooui-dialog-process-retry": "Poskusi znova" + "ooui-dialog-process-retry": "Poskusi znova", + "ooui-dialog-process-continue": "Nadaljuj" } diff --git a/lib/oojs-ui/i18n/uk.json b/lib/oojs-ui/i18n/uk.json index f4d4a5c..0197a4c 100644 --- a/lib/oojs-ui/i18n/uk.json +++ b/lib/oojs-ui/i18n/uk.json @@ -28,5 +28,6 @@ "ooui-dialog-message-reject": "Скасувати", "ooui-dialog-process-error": "Щось пішло не так", "ooui-dialog-process-dismiss": "Приховати", - "ooui-dialog-process-retry": "Спробуйте ще раз" + "ooui-dialog-process-retry": "Спробуйте ще раз", + "ooui-dialog-process-continue": "Продовжити" } diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 4c4512b..cc6550b 100644 --- a/lib/oojs-ui/oojs-ui-apex.css +++ b/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -324,22 +324,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; left: 0; @@ -347,19 +347,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; left: 0; right: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -545,6 +545,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -646,28 +647,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { right: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-right: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: right; - padding-right: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-left: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -726,26 +722,27 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-right: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-left: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -759,9 +756,7 @@ .oo-ui-listToolGroup .oo-ui-tool { border: solid 1px transparent; margin: -1px 0; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-right: 0.5em; + padding: 0 0.25em 0 0; } .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled { border-color: rgba(0, 0, 0, 0.1); @@ -793,7 +788,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -813,9 +808,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -832,11 +825,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: rgba(0, 0, 0, 0.25); } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 1em 0 0.25em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.75em 0 0.25em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1082,7 +1072,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-left: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js index eefc652..6fcf2fc 100644 --- a/lib/oojs-ui/oojs-ui-apex.js +++ b/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:09Z + * Date: 2014-12-16T21:00:55Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index c90a5fa..33a754d 100644 --- a/lib/oojs-ui/oojs-ui-apex.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -324,22 +324,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; right: 0; @@ -347,19 +347,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; right: 0; left: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-left: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -545,6 +545,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -646,28 +647,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { left: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-left: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: left; - padding-left: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-right: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -726,26 +722,27 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-left: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-right: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -759,9 +756,7 @@ .oo-ui-listToolGroup .oo-ui-tool { border: solid 1px transparent; margin: -1px 0; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-left: 0.5em; + padding: 0 0 0 0.25em; } .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled { border-color: rgba(0, 0, 0, 0.1); @@ -793,7 +788,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -813,9 +808,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -832,11 +825,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: rgba(0, 0, 0, 0.25); } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 0.25em 0 1em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.25em 0 0.75em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1082,7 +1072,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-right: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css index 1236d0b..fee6163 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -324,22 +324,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; left: 0; @@ -347,19 +347,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; left: 0; right: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -545,6 +545,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -646,28 +647,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { right: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-right: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: right; - padding-right: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-left: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -726,26 +722,27 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-right: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-left: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -759,9 +756,7 @@ .oo-ui-listToolGroup .oo-ui-tool { border: solid 1px transparent; margin: -1px 0; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-right: 0.5em; + padding: 0 0.25em 0 0; } .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled { border-color: rgba(0, 0, 0, 0.1); @@ -793,7 +788,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -813,9 +808,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -832,11 +825,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: rgba(0, 0, 0, 0.25); } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 1em 0 0.25em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.75em 0 0.25em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1082,7 +1072,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-left: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css index 3520079..9dde903 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -324,22 +324,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; right: 0; @@ -347,19 +347,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; right: 0; left: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-left: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -545,6 +545,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -646,28 +647,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { left: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-left: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: left; - padding-left: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-right: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -726,26 +722,27 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-left: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-right: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -759,9 +756,7 @@ .oo-ui-listToolGroup .oo-ui-tool { border: solid 1px transparent; margin: -1px 0; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-left: 0.5em; + padding: 0 0 0 0.25em; } .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled { border-color: rgba(0, 0, 0, 0.1); @@ -793,7 +788,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -813,9 +808,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -832,11 +825,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: rgba(0, 0, 0, 0.25); } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 0.25em 0 1em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.25em 0 0.75em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1082,7 +1072,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-right: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css b/lib/oojs-ui/oojs-ui-mediawiki.css index 2d1060c..24e0df6 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -332,22 +332,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; left: 0; @@ -355,19 +355,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; left: 0; right: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -528,7 +528,7 @@ .oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { color: #000000; } -.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-barToolGroup > .oo-ui-iconElement-icon, @@ -546,6 +546,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -619,28 +620,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { right: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-right: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: right; - padding-right: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-left: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -683,32 +679,30 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-right: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-left: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; } .oo-ui-listToolGroup .oo-ui-tool { - padding: 0 0.25em; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-right: 0.5em; + padding: 0 0.5em 0 0.25em; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; @@ -720,7 +714,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -746,9 +740,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -768,11 +760,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: #aaaaaa; } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 1em 0 0.25em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.75em 0 0.25em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1014,7 +1003,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-left: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { @@ -1317,6 +1305,7 @@ .oo-ui-radioInputWidget { position: relative; line-height: 2em; + white-space: nowrap; } .oo-ui-radioInputWidget * { font: inherit; @@ -1334,11 +1323,11 @@ margin: 0 0.4em; } .oo-ui-radioInputWidget input[type="radio"] + span::before { - transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); - -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); content: ""; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js index b590c97..f39ec57 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:09Z + * Date: 2014-12-16T21:00:55Z */ /** * @class diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css index 42f398a..699d63f 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -332,22 +332,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; right: 0; @@ -355,19 +355,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; right: 0; left: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-left: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -528,7 +528,7 @@ .oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { color: #000000; } -.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-barToolGroup > .oo-ui-iconElement-icon, @@ -546,6 +546,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -619,28 +620,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { left: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-left: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: left; - padding-left: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-right: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -683,32 +679,30 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-left: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-right: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; } .oo-ui-listToolGroup .oo-ui-tool { - padding: 0 0.25em; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-left: 0.5em; + padding: 0 0.25em 0 0.5em; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; @@ -720,7 +714,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -746,9 +740,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -768,11 +760,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: #aaaaaa; } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 0.25em 0 1em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.25em 0 0.75em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1014,7 +1003,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-right: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { @@ -1317,6 +1305,7 @@ .oo-ui-radioInputWidget { position: relative; line-height: 2em; + white-space: nowrap; } .oo-ui-radioInputWidget * { font: inherit; @@ -1334,11 +1323,11 @@ margin: 0 0.4em; } .oo-ui-radioInputWidget input[type="radio"] + span::before { - transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); - -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); content: ""; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 0713084..4409643 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -332,22 +332,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; left: 0; @@ -355,19 +355,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; left: 0; right: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-right: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -528,7 +528,7 @@ .oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { color: #000000; } -.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-barToolGroup > .oo-ui-iconElement-icon, @@ -546,6 +546,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -619,28 +620,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { right: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-right: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: right; - padding-right: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-left: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -683,32 +679,30 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-right: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-left: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; } .oo-ui-listToolGroup .oo-ui-tool { - padding: 0 0.25em; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-right: 0.5em; + padding: 0 0.5em 0 0.25em; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; @@ -720,7 +714,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -746,9 +740,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -768,11 +760,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: #aaaaaa; } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 1em 0 0.25em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.75em 0 0.25em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1014,7 +1003,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-left: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { @@ -1317,6 +1305,7 @@ .oo-ui-radioInputWidget { position: relative; line-height: 2em; + white-space: nowrap; } .oo-ui-radioInputWidget * { font: inherit; @@ -1334,11 +1323,11 @@ margin: 0 0.4em; } .oo-ui-radioInputWidget input[type="radio"] + span::before { - transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); - -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); content: ""; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css index bf4bf84..7503274 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:21Z + * Date: 2014-12-16T21:01:07Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -332,22 +332,22 @@ display: block; background: rgba(0, 0, 0, 0.4); } -.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable { overflow-y: hidden; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-scrollable { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-scrollable { overflow-y: auto; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout-padded { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout-padded { padding: 2em; } -.oo-ui-bookletLayout-outlinePanel-editable .oo-ui-outlineSelectWidget { +.oo-ui-bookletLayout-outlinePanel-editable > .oo-ui-outlineSelectWidget { position: absolute; top: 0; right: 0; @@ -355,19 +355,19 @@ bottom: 3em; overflow-y: auto; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { position: absolute; bottom: 0; right: 0; left: 0; } -.oo-ui-bookletLayout-stackLayout .oo-ui-panelLayout { +.oo-ui-bookletLayout-stackLayout > .oo-ui-panelLayout { padding: 1.5em; } .oo-ui-bookletLayout-outlinePanel { border-left: solid 1px #dddddd; } -.oo-ui-bookletLayout-outlinePanel .oo-ui-outlineControlsWidget { +.oo-ui-bookletLayout-outlinePanel > .oo-ui-outlineControlsWidget { box-shadow: 0 0 0.25em rgba(0, 0, 0, 0.25); } .oo-ui-fieldLayout { @@ -528,7 +528,7 @@ .oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title { color: #000000; } -.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-toolGroup.oo-ui-widget-enabled .oo-ui-tool-link .oo-ui-tool-accel { color: #888888; } .oo-ui-barToolGroup > .oo-ui-iconElement-icon, @@ -546,6 +546,7 @@ .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { display: block; } +.oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-barToolGroup .oo-ui-tool-link .oo-ui-tool-title { display: none; } @@ -619,28 +620,23 @@ .oo-ui-popupToolGroup-right > .oo-ui-toolGroup-tools { left: 0; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { - display: inline-block; +.oo-ui-popupToolGroup .oo-ui-tool-link { + display: table; + width: 100%; vertical-align: middle; + white-space: nowrap; + text-decoration: none; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon, +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { - display: inline-table; - vertical-align: middle; - width: 100%; - margin-left: -2.5em; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text, -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { display: table-cell; + vertical-align: middle; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-title-text { - width: 100%; -} -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel { text-align: left; - padding-left: 2.5em; } -.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel:not(:empty) { +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel:not(:empty) { padding-right: 3em; } .oo-ui-popupToolGroup.oo-ui-indicatorElement.oo-ui-iconElement { @@ -683,32 +679,30 @@ .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { height: 2em; width: 2em; - margin-left: 0.25em; + min-width: 2em; } +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { + padding-right: 0.25em; +} +.oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-accel, .oo-ui-popupToolGroup .oo-ui-tool-link .oo-ui-tool-title { line-height: 2em; font-size: 0.8em; } .oo-ui-listToolGroup .oo-ui-tool { - display: inline-block; - width: 100%; + display: block; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-listToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; } .oo-ui-listToolGroup .oo-ui-tool { - padding: 0 0.25em; -} -.oo-ui-listToolGroup .oo-ui-tool-link { - padding-left: 0.5em; + padding: 0 0.25em 0 0.5em; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover { background-color: #eeeeee; @@ -720,7 +714,7 @@ .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title { color: #cccccc; } -.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title .oo-ui-tool-accel { +.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel { color: #dddddd; } .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon { @@ -746,9 +740,7 @@ display: block; } .oo-ui-menuToolGroup .oo-ui-tool-link { - display: block; cursor: pointer; - white-space: nowrap; } .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link { cursor: default; @@ -768,11 +760,8 @@ .oo-ui-menuToolGroup.oo-ui-popupToolGroup-active { border-color: #aaaaaa; } -.oo-ui-menuToolGroup .oo-ui-tool-link { - padding: 0 0.25em 0 1em; - display: block; - cursor: pointer; - white-space: nowrap; +.oo-ui-menuToolGroup .oo-ui-tool { + padding: 0 0.25em 0 0.75em; } .oo-ui-menuToolGroup .oo-ui-tool-link .oo-ui-iconElement-icon { background-image: none; @@ -1014,7 +1003,6 @@ } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed .oo-ui-buttonElement-button { border-radius: 0; - margin-bottom: -1px; margin-right: -1px; } .oo-ui-buttonGroupWidget .oo-ui-buttonElement-framed:first-child .oo-ui-buttonElement-button { @@ -1317,6 +1305,7 @@ .oo-ui-radioInputWidget { position: relative; line-height: 2em; + white-space: nowrap; } .oo-ui-radioInputWidget * { font: inherit; @@ -1334,11 +1323,11 @@ margin: 0 0.4em; } .oo-ui-radioInputWidget input[type="radio"] + span::before { - transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); - -webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); + transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275); content: ""; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index 7f519a6..5f75895 100644 --- a/lib/oojs-ui/oojs-ui.js +++ b/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.5.0 + * OOjs UI v0.6.0 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-12T20:13:09Z + * Date: 2014-12-16T21:00:55Z */ ( function ( OO ) { @@ -2730,10 +2730,9 @@ * * @param {jQuery.Event} e Mouse wheel event */ -OO.ui.WindowManager.prototype.onWindowMouseWheel = function ( e ) { - // Kill all events in the parent window if the child window is isolated, - // or if the event didn't come from the child window - return !( this.shouldIsolate() || !$.contains( this.getCurrentWindow().$frame[0], e.target ) ); +OO.ui.WindowManager.prototype.onWindowMouseWheel = function () { + // Kill all events in the parent window if the child window is isolated + return !this.shouldIsolate(); }; /** @@ -2751,9 +2750,8 @@ case OO.ui.Keys.UP: case OO.ui.Keys.RIGHT: case OO.ui.Keys.DOWN: - // Kill all events in the parent window if the child window is isolated, - // or if the event didn't come from the child window - return !( this.shouldIsolate() || !$.contains( this.getCurrentWindow().$frame[0], e.target ) ); + // Kill all events in the parent window if the child window is isolated + return !this.shouldIsolate(); } }; @@ -3183,6 +3181,10 @@ // Start listening for top-level window dimension changes 'orientationchange resize': this.onWindowResizeHandler } ); + // Disable window scrolling in isolated windows + if ( !this.shouldIsolate() ) { + $( this.getElementDocument().body ).css( 'overflow', 'hidden' ); + } this.globalEvents = true; } } else if ( this.globalEvents ) { @@ -3197,6 +3199,9 @@ // Stop listening for top-level window dimension changes 'orientationchange resize': this.onWindowResizeHandler } ); + if ( !this.shouldIsolate() ) { + $( this.getElementDocument().body ).css( 'overflow', '' ); + } this.globalEvents = false; } @@ -5433,10 +5438,16 @@ ccOffset = $container.offset() || { top: 0, left: 0 }, ccHeight = $container.innerHeight() - buffer, ccWidth = $container.innerWidth() - buffer, + cHeight = this.$clippable.outerHeight() + buffer, + cWidth = this.$clippable.outerWidth() + buffer, scrollTop = this.$clippableScroller.scrollTop(), scrollLeft = this.$clippableScroller.scrollLeft(), - desiredWidth = ( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left, - desiredHeight = ( ccOffset.top + scrollTop + ccHeight ) - cOffset.top, + desiredWidth = cOffset.left < 0 ? + cWidth + cOffset.left : + ( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left, + desiredHeight = cOffset.top < 0 ? + cHeight + cOffset.top : + ( ccOffset.top + scrollTop + ccHeight ) - cOffset.top, naturalWidth = this.$clippable.prop( 'scrollWidth' ), naturalHeight = this.$clippable.prop( 'scrollHeight' ), clipWidth = desiredWidth < naturalWidth, @@ -5493,7 +5504,6 @@ this.toolbar = this.toolGroup.getToolbar(); this.active = false; this.$title = this.$( '<span>' ); - this.$titleText = this.$( '<span>' ); this.$accel = this.$( '<span>' ); this.$link = this.$( '<a>' ); this.title = null; @@ -5502,7 +5512,7 @@ this.toolbar.connect( this, { updateState: 'onUpdateState' } ); // Initialization - this.$titleText.addClass( 'oo-ui-tool-title-text' ); + this.$title.addClass( 'oo-ui-tool-title' ); this.$accel .addClass( 'oo-ui-tool-accel' ) .prop( { @@ -5511,12 +5521,9 @@ dir: 'ltr', lang: 'en' } ); - this.$title - .addClass( 'oo-ui-tool-title' ) - .append( this.$titleText, this.$accel ); this.$link .addClass( 'oo-ui-tool-link' ) - .append( this.$icon, this.$title ) + .append( this.$icon, this.$title, this.$accel ) .prop( 'tabIndex', 0 ) .attr( 'role', 'button' ); this.$element @@ -5704,7 +5711,7 @@ accel = this.toolbar.getToolAccelerator( this.constructor.static.name ), tooltipParts = []; - this.$titleText.text( this.title ); + this.$title.text( this.title ); this.$accel.text( accel ); if ( titleTooltips && typeof this.title === 'string' && this.title.length ) { @@ -8224,7 +8231,7 @@ // 'display' attribute and restores it, and the tool uses a <span> and can be hidden and re-shown. // Is this a jQuery bug? http://jsfiddle.net/gtj4hu3h/ if ( this.getExpandCollapseTool().$element.css( 'display' ) === 'inline' ) { - this.getExpandCollapseTool().$element.css( 'display', 'inline-block' ); + this.getExpandCollapseTool().$element.css( 'display', 'block' ); } this.updateCollapsibleState(); diff --git a/src/ui/styles/tools/ve.ui.FormatTool.css b/src/ui/styles/tools/ve.ui.FormatTool.css index f07c75e..7f625d5 100644 --- a/src/ui/styles/tools/ve.ui.FormatTool.css +++ b/src/ui/styles/tools/ve.ui.FormatTool.css @@ -4,48 +4,48 @@ * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org */ -.oo-ui-menuToolGroup .oo-ui-tool-name-paragraph .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-paragraph .oo-ui-tool-title { font-weight: normal; } -.oo-ui-menuToolGroup .oo-ui-tool-name-heading1 .oo-ui-tool-title-text { - font-size: 190%; - font-weight: normal; -} - -.oo-ui-menuToolGroup .oo-ui-tool-name-heading2 .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-heading1 .oo-ui-tool-title { font-size: 150%; font-weight: normal; } -.oo-ui-menuToolGroup .oo-ui-tool-name-heading3 .oo-ui-tool-title-text { - font-size: 130%; +.oo-ui-menuToolGroup .oo-ui-tool-name-heading2 .oo-ui-tool-title { + font-size: 120%; + font-weight: normal; +} + +.oo-ui-menuToolGroup .oo-ui-tool-name-heading3 .oo-ui-tool-title { + font-size: 105%; font-weight: bold; } -.oo-ui-menuToolGroup .oo-ui-tool-name-heading4 .oo-ui-tool-title-text { - font-size: 115%; +.oo-ui-menuToolGroup .oo-ui-tool-name-heading4 .oo-ui-tool-title { + font-size: 92%; font-weight: bold; } -.oo-ui-menuToolGroup .oo-ui-tool-name-heading5 .oo-ui-tool-title-text { - font-size: 100%; - font-weight: bold; -} - -.oo-ui-menuToolGroup .oo-ui-tool-name-heading6 .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-heading5 .oo-ui-tool-title { font-size: 80%; font-weight: bold; } -.oo-ui-menuToolGroup .oo-ui-tool-name-preformatted .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-heading6 .oo-ui-tool-title { + font-size: 64%; + font-weight: bold; +} + +.oo-ui-menuToolGroup .oo-ui-tool-name-preformatted .oo-ui-tool-title { font-family: monospace, "Courier New"; } -.oo-ui-menuToolGroup .oo-ui-tool-name-blockquote .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-blockquote .oo-ui-tool-title { padding-left: 1em; } -.oo-ui-menuToolGroup .oo-ui-tool-name-tableCellHeader .oo-ui-tool-title-text { +.oo-ui-menuToolGroup .oo-ui-tool-name-tableCellHeader .oo-ui-tool-title { font-weight: bold; } -- To view, visit https://gerrit.wikimedia.org/r/179788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69622a4dbfc158ad0a3a595d907714f770af910e Gerrit-PatchSet: 3 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
