From: James D. Forrester <jforrester@wikimedia.org>
Date: Mon, 15 Sep 2014 15:00:27 +0000 (-0700)
Subject: Update OOjs UI to v0.1.0-pre (073f37e258)
X-Git-Tag: 1.31.0-rc.0~14015^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=8cfe5328bb2a9c1e81932d676b4b1828b2d95e96;p=lhc%2Fweb%2Fwiklou.git

Update OOjs UI to v0.1.0-pre (073f37e258)

New changes:
073f37e Improve FieldLayout help popup appearance

Change-Id: I6f201a99f40a8504a4c42d8f2220a3a7319a6025
---

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 0000000000..a5a0a6633d
Binary files /dev/null and b/resources/lib/oojs-ui/images/icons/help-rtl.png differ
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.$( '<span>' ).text( config.help ) );
+		this.popupButtonWidget.getPopup().$body.append(
+			this.$( '<div>' )
+				.text( config.help )
+				.addClass( 'oo-ui-fieldLayout-help-content' )
+		);
 		this.$help = this.popupButtonWidget.$element;
 	} else {
-		this.$help = this.$( '<div>' );
+		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.