From 8cfe5328bb2a9c1e81932d676b4b1828b2d95e96 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 15 Sep 2014 08:00:27 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (073f37e258) New changes: 073f37e Improve FieldLayout help popup appearance Change-Id: I6f201a99f40a8504a4c42d8f2220a3a7319a6025 --- resources/lib/oojs-ui/images/icons/help-rtl.png | Bin 0 -> 578 bytes resources/lib/oojs-ui/oojs-ui-apex.css | 10 ++++++++-- resources/lib/oojs-ui/oojs-ui-minerva.css | 10 ++++++++-- resources/lib/oojs-ui/oojs-ui.js | 16 ++++++++++------ resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 5 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 resources/lib/oojs-ui/images/icons/help-rtl.png diff --git a/resources/lib/oojs-ui/images/icons/help-rtl.png b/resources/lib/oojs-ui/images/icons/help-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a0a6633d8acd831f2a9a3c685bf6e1a31a4f06 GIT binary patch literal 578 zcmV-I0=@l-P)7tTf)*>@&0$aeh;QFDUurV-@^k-@VGwT4Gz#MQ6 zjDR!X(jhHi3Frb}fWN@5q$DRM>BRv$KmrVbKG29U0k+|op>sMpOhjk`hfZimxmmAz z8F(M%+RixynpFlnUP(W??*TtOmw3z8BTV0OJB0>bMFQ-FZ2>;H;1Ku$dobRg+5!e-n|D`)T!R^?*%z_#bM&Fll^ap|~1gVK=n8#n=GfYoU@MFtbnUbjlH zNB&!7&~lAQnE|A;UKCk>=PL{{Zlyuj%yO-hbSJ4JX{|`vIo(nN--=_>G3%9xBxaW1 zH)-^oI}SH&T;oQNCWZlcI_I3R>FPzAzo>%5;MeSb|&oB*SDx($B Qv;Y7A07*qoM6N<$f}$h%wg3PC literal 0 HcmV?d00001 diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index c4daa624ae..c4fbb47392 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 (bd008e8aed) + * OOjs UI v0.1.0-pre (073f37e258) * 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-09-11T23:10:10Z + * Date: 2014-09-15T15:00:24Z */ /* * Blank theme mixins. @@ -326,6 +326,12 @@ .oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { z-index: 1; } +.oo-ui-fieldLayout .oo-ui-fieldLayout-help { + float: right; +} +.oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { + padding: 0.5em 0.75em; +} .oo-ui-fieldLayout:last-child { margin-bottom: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.css b/resources/lib/oojs-ui/oojs-ui-minerva.css index 801dfc6c3e..fa8efee46e 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.css +++ b/resources/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (bd008e8aed) + * OOjs UI v0.1.0-pre (073f37e258) * 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-09-11T23:10:10Z + * Date: 2014-09-15T15:00:24Z */ /* * Blank theme mixins. @@ -168,6 +168,12 @@ .oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { z-index: 1; } +.oo-ui-fieldLayout .oo-ui-fieldLayout-help { + float: right; +} +.oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { + padding: 0.5em 0.75em; +} .oo-ui-fieldLayout:last-child { margin-bottom: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index ea086a137d..1583fec5a4 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 (bd008e8aed) + * OOjs UI v0.1.0-pre (073f37e258) * 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-09-11T23:10:10Z + * Date: 2014-09-15T15:00:24Z */ ( function ( OO ) { @@ -6429,15 +6429,19 @@ OO.ui.FieldLayout = function OoUiFieldLayout( field, config ) { if ( config.help ) { this.popupButtonWidget = new OO.ui.PopupButtonWidget( { $: this.$, + classes: [ 'oo-ui-fieldLayout-help' ], framed: false, - icon: 'info', - title: config.help + icon: 'info' } ); - this.popupButtonWidget.getPopup().$body.append( this.$( '' ).text( config.help ) ); + this.popupButtonWidget.getPopup().$body.append( + this.$( '
' ) + .text( config.help ) + .addClass( 'oo-ui-fieldLayout-help-content' ) + ); this.$help = this.popupButtonWidget.$element; } else { - this.$help = this.$( '
' ); + this.$help = this.$( [] ); } // Events diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 61e7f396ad..aca127ae45 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 (bd008e8aed) + * OOjs UI v0.1.0-pre (073f37e258) * 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-09-11T23:10:10Z + * Date: 2014-09-15T15:00:24Z */ /* * Blank theme mixins. -- 2.20.1