Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 66 insertions, 0 deletions

diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
new file mode 100644
index 00000000..eaca1f15
--- /dev/null
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -0,0 +1,66 @@
+/*!
+ * OOjs UI v0.11.3
+ * 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-05-12T12:15:37Z
+ */
+/**
+ * @class
+ * @extends OO.ui.Theme
+ *
+ * @constructor
+ */
+OO.ui.MediaWikiTheme = function OoUiMediaWikiTheme() {
+	// Parent constructor
+	OO.ui.MediaWikiTheme.super.call( this );
+};
+
+/* Setup */
+
+OO.inheritClass( OO.ui.MediaWikiTheme, OO.ui.Theme );
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) {
+	// Parent method
+	var variant,
+		variants = {
+			warning: false,
+			invert: false,
+			progressive: false,
+			constructive: false,
+			destructive: false
+		},
+		// Parent method
+		classes = OO.ui.MediaWikiTheme.super.prototype.getElementClasses.call( this, element ),
+		isFramed;
+
+	if ( element.supports( [ 'hasFlag' ] ) ) {
+		isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed();
+		if ( isFramed && ( element.isDisabled() || element.hasFlag( 'primary' ) ) ) {
+			variants.invert = true;
+		} else {
+			variants.progressive = element.hasFlag( 'progressive' );
+			variants.constructive = element.hasFlag( 'constructive' );
+			variants.destructive = element.hasFlag( 'destructive' );
+			variants.warning = element.hasFlag( 'warning' );
+		}
+	}
+
+	for ( variant in variants ) {
+		classes[ variants[ variant ] ? 'on' : 'off' ].push( 'oo-ui-image-' + variant );
+	}
+
+	return classes;
+};
+
+/* Instantiation */
+
+OO.ui.theme = new OO.ui.MediaWikiTheme();