Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

2 files changed, 45 insertions, 0 deletions

diff --git a/vendor/oojs/oojs-ui/php/themes/ApexTheme.php b/vendor/oojs/oojs-ui/php/themes/ApexTheme.php
new file mode 100644
index 00000000..e812736e
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/themes/ApexTheme.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace OOUI;
+
+class ApexTheme extends Theme {
+}
diff --git a/vendor/oojs/oojs-ui/php/themes/MediaWikiTheme.php b/vendor/oojs/oojs-ui/php/themes/MediaWikiTheme.php
new file mode 100644
index 00000000..86e4c353
--- /dev/null
+++ b/vendor/oojs/oojs-ui/php/themes/MediaWikiTheme.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace OOUI;
+
+class MediaWikiTheme extends Theme {
+
+	/* Methods */
+
+	public function getElementClasses( Element $element ) {
+		$variants = array(
+			'warning' => false,
+			'invert' => false,
+			'progressive' => false,
+			'constructive' => false,
+			'destructive' => false
+		);
+
+		// Parent method
+		$classes = parent::getElementClasses( $element );
+
+		if ( $element->supports( array( 'hasFlag' ) ) ) {
+			$isFramed = $element->supports( array( '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' );
+			}
+		}
+
+		foreach ( $variants as $variant => $toggle ) {
+			$classes[$toggle ? 'on' : 'off'][] = 'oo-ui-image-' . $variant;
+		}
+
+		return $classes;
+	}
+}