From 2e8e02b9d9d8e201301fc684dada5ee770822984 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Sat, 19 Jul 2014 15:45:44 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (5ab041a801) New changes: a30c514 Localisation updates from https://translatewiki.net. e2e1a12 Localisation updates from https://translatewiki.net. a6248f0 build: Update grunt-jscs (formerly grunt-jscs-checker) from 0.6.0 to 0.6.1 7710fe7 Set actions buttons to be framed by default 59ef352 Localisation updates from https://translatewiki.net. Change-Id: I3172324ee6c17aa0951e7c4695bf89af47addf07 --- resources/lib/oojs-ui/i18n/ast.json | 10 +++---- resources/lib/oojs-ui/i18n/ilo.json | 10 +++---- resources/lib/oojs-ui/i18n/om.json | 8 ++++-- resources/lib/oojs-ui/i18n/qqq.json | 4 +-- resources/lib/oojs-ui/i18n/yi.json | 1 + resources/lib/oojs-ui/i18n/zh-hant.json | 10 +++---- resources/lib/oojs-ui/oojs-ui-agora.css | 34 +++++++++++++++--------- resources/lib/oojs-ui/oojs-ui-apex.css | 35 ++++++++++++++----------- resources/lib/oojs-ui/oojs-ui.js | 8 +++--- resources/lib/oojs-ui/oojs-ui.svg.css | 4 +-- 10 files changed, 72 insertions(+), 52 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/ast.json b/resources/lib/oojs-ui/i18n/ast.json index eb39dac8de..87d7688a79 100644 --- a/resources/lib/oojs-ui/i18n/ast.json +++ b/resources/lib/oojs-ui/i18n/ast.json @@ -6,13 +6,13 @@ "Xuacu" ] }, - "ooui-dialog-action-close": "Zarrar", "ooui-outline-control-move-down": "Mover abaxo l'elementu", "ooui-outline-control-move-up": "Mover arriba l'elementu", "ooui-outline-control-remove": "Desaniciar elementu", "ooui-toolbar-more": "Más", - "ooui-dialog-confirm-title": "Confirmar", - "ooui-dialog-confirm-default-prompt": "¿Tas seguru?", - "ooui-dialog-confirm-default-ok": "Aceutar", - "ooui-dialog-confirm-default-cancel": "Encaboxar" + "ooui-dialog-message-accept": "Aceutar", + "ooui-dialog-message-reject": "Encaboxar", + "ooui-dialog-process-error": "Daqué funcionó mal", + "ooui-dialog-process-dismiss": "Descartar", + "ooui-dialog-process-retry": "Vuelvi a intentalo" } diff --git a/resources/lib/oojs-ui/i18n/ilo.json b/resources/lib/oojs-ui/i18n/ilo.json index 5d9e3bb8b8..81a91ed4e4 100644 --- a/resources/lib/oojs-ui/i18n/ilo.json +++ b/resources/lib/oojs-ui/i18n/ilo.json @@ -4,13 +4,13 @@ "Lam-ang" ] }, - "ooui-dialog-action-close": "Irekep", "ooui-outline-control-move-down": "Ipababa ti banag", "ooui-outline-control-move-up": "Ipangato ti banag", "ooui-outline-control-remove": "Ikkaten ti banag", "ooui-toolbar-more": "Adu pay", - "ooui-dialog-confirm-title": "Pasingkedan", - "ooui-dialog-confirm-default-prompt": "Siguradoka kadi?", - "ooui-dialog-confirm-default-ok": "Sige", - "ooui-dialog-confirm-default-cancel": "Ukasen" + "ooui-dialog-message-accept": "Sige", + "ooui-dialog-message-reject": "Ukasen", + "ooui-dialog-process-error": "Adda madi a napasamak", + "ooui-dialog-process-dismiss": "Pugsayen", + "ooui-dialog-process-retry": "Padasen manen" } diff --git a/resources/lib/oojs-ui/i18n/om.json b/resources/lib/oojs-ui/i18n/om.json index 35e7ee4d06..c62782ef8f 100644 --- a/resources/lib/oojs-ui/i18n/om.json +++ b/resources/lib/oojs-ui/i18n/om.json @@ -5,9 +5,13 @@ "Tumsaa" ] }, - "ooui-dialog-action-close": "Cufi", "ooui-outline-control-move-down": "Gad buusi", "ooui-outline-control-move-up": "Ol baasi", "ooui-outline-control-remove": "Balleessi", - "ooui-toolbar-more": "Dabalata" + "ooui-toolbar-more": "Dabalata", + "ooui-dialog-message-accept": "Tole", + "ooui-dialog-message-reject": "Dhiisi", + "ooui-dialog-process-error": "Dogoggorri wayii ummameera", + "ooui-dialog-process-dismiss": "Didi", + "ooui-dialog-process-retry": "Itti deebi'ii yaali" } diff --git a/resources/lib/oojs-ui/i18n/qqq.json b/resources/lib/oojs-ui/i18n/qqq.json index e8ab9f9e55..9b3bb6053c 100644 --- a/resources/lib/oojs-ui/i18n/qqq.json +++ b/resources/lib/oojs-ui/i18n/qqq.json @@ -24,8 +24,8 @@ "ooui-outline-control-move-up": "Tool tip for a button that moves items in a list up one place", "ooui-outline-control-remove": "Tool tip for a button that removes items from a list.\n{{Identical|Remove item}}", "ooui-toolbar-more": "Label for the toolbar group that contains a list of all other available tools.\n{{Identical|More}}", - "ooui-dialog-message-accept": "Default label for the accept button of a message dialog", - "ooui-dialog-message-reject": "Default label for the reject button of a message dialog", + "ooui-dialog-message-accept": "Default label for the accept button of a message dialog\n{{Identical|OK}}", + "ooui-dialog-message-reject": "Default label for the reject button of a message dialog\n{{Identical|Cancel}}", "ooui-dialog-process-error": "Title for process dialog error description", "ooui-dialog-process-dismiss": "Label for process dialog dismiss error button, visible when describing errors\n{{Identical|Dismiss}}", "ooui-dialog-process-retry": "Label for process dialog retry action button, visible when describing recoverable errors\n{{Identical|Try again}}" diff --git a/resources/lib/oojs-ui/i18n/yi.json b/resources/lib/oojs-ui/i18n/yi.json index e26af708cd..a850fce269 100644 --- a/resources/lib/oojs-ui/i18n/yi.json +++ b/resources/lib/oojs-ui/i18n/yi.json @@ -13,5 +13,6 @@ "ooui-dialog-message-accept": "יאָ", "ooui-dialog-message-reject": "אַנולירן", "ooui-dialog-process-error": "עפעס איז דורכגעפאלן", + "ooui-dialog-process-dismiss": "צומאַכן", "ooui-dialog-process-retry": "פרובירט נאכאמאל" } diff --git a/resources/lib/oojs-ui/i18n/zh-hant.json b/resources/lib/oojs-ui/i18n/zh-hant.json index 255658b569..05fb20d16a 100644 --- a/resources/lib/oojs-ui/i18n/zh-hant.json +++ b/resources/lib/oojs-ui/i18n/zh-hant.json @@ -16,13 +16,13 @@ "Cwlin0416" ] }, - "ooui-dialog-action-close": "關閉", "ooui-outline-control-move-down": "項目下移", "ooui-outline-control-move-up": "項目上移", "ooui-outline-control-remove": "移除項目", "ooui-toolbar-more": "更多", - "ooui-dialog-confirm-title": "確認", - "ooui-dialog-confirm-default-prompt": "您確定嗎？", - "ooui-dialog-confirm-default-ok": "確定", - "ooui-dialog-confirm-default-cancel": "取消" + "ooui-dialog-message-accept": "確定", + "ooui-dialog-message-reject": "取消", + "ooui-dialog-process-error": "發生不明錯誤", + "ooui-dialog-process-dismiss": "放棄", + "ooui-dialog-process-retry": "再試一次" } diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css b/resources/lib/oojs-ui/oojs-ui-agora.css index 565148ad71..49b4cdab91 100644 --- a/resources/lib/oojs-ui/oojs-ui-agora.css +++ b/resources/lib/oojs-ui/oojs-ui-agora.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a1b99bb256) + * OOjs UI v0.1.0-pre (5ab041a801) * 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-07-17T19:17:19Z + * Date: 2014-07-19T22:45:44Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -221,6 +221,14 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0 0.75em 0.75em; + border: solid 1px #ccc; + border-radius: 0.25em; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { @@ -243,6 +251,18 @@ background-color: rgba(0, 0, 0, 0.1); } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover { background-color: rgba(8, 126, 204, 0.05); @@ -294,16 +314,6 @@ padding-right: 2.25em; } -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0.75em 0 0; - border: solid 1px #ccc; - border-radius: 0.25em; -} - .oo-ui-processDialog > .oo-ui-window-frame { min-height: 5em; } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 1157ff9272..56121d37cd 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a1b99bb256) + * OOjs UI v0.1.0-pre (5ab041a801) * 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-07-17T19:17:19Z + * Date: 2014-07-19T22:45:44Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -284,6 +284,12 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0 0.75em 0.75em; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { @@ -291,11 +297,6 @@ vertical-align: middle; } -.oo-ui-processDialog-actions-safe.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, -.oo-ui-processDialog-actions-primary.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { - margin: 0.75em; -} - .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:hover, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:hover { background-color: rgba(0, 0, 0, 0.05); @@ -306,6 +307,18 @@ background-color: rgba(0, 0, 0, 0.1); } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover { background-color: rgba(8, 126, 204, 0.05); @@ -357,14 +370,6 @@ padding-right: 2.25em; } -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0.75em 0 0; -} - .oo-ui-processDialog > .oo-ui-window-frame { min-height: 5em; } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 6c8deda99a..5bbdddd0ba 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a1b99bb256) + * OOjs UI v0.1.0-pre (5ab041a801) * 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-07-17T19:17:19Z + * Date: 2014-07-19T22:45:44Z */ ( function ( OO ) { @@ -5455,7 +5455,7 @@ OO.ui.ProcessDialog.prototype.attachActions = function () { others = this.actions.getOthers(); if ( special.primary ) { this.$primaryActions.append( special.primary.$element ); - special.primary.toggleFramed( false ); + special.primary.toggleFramed( true ); } if ( others.length ) { for ( i = 0, len = others.length; i < len; i++ ) { @@ -5466,7 +5466,7 @@ OO.ui.ProcessDialog.prototype.attachActions = function () { } if ( special.safe ) { this.$safeActions.append( special.safe.$element ); - special.safe.toggleFramed( false ); + special.safe.toggleFramed( true ); } this.fitLabel(); diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 6db85cdb82..0205979e02 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (a1b99bb256) + * OOjs UI v0.1.0-pre (5ab041a801) * 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-07-17T19:17:19Z + * Date: 2014-07-19T22:45:44Z */ /* Textures */ -- 2.20.1