From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 12 Dec 2014 21:13:55 +0000 (+0000)
Subject: Merge "Resources: Split oojs-ui module styling into oojs-ui.styles"
X-Git-Tag: 1.31.0-rc.0~12980
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=d5a530de00068831653c573926b5755b4ca5ac8d;hp=586c0a39420b2c88fcf9d48a0cac914e42cf1d4a;p=lhc%2Fweb%2Fwiklou.git

Merge "Resources: Split oojs-ui module styling into oojs-ui.styles"
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 1eda5d6ff9..a12234ac97 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1631,9 +1631,10 @@ return array(
 			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js',
 			'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js',
 		),
-		'skinStyles' => array(
-			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
-			'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
+		'dependencies' => array(
+			'es5-shim',
+			'oojs',
+			'oojs-ui.styles',
 		),
 		'messages' => array(
 			'ooui-dialog-message-accept',
@@ -1649,9 +1650,14 @@ return array(
 			'ooui-toolgroup-collapse',
 			'ooui-toolgroup-expand',
 		),
-		'dependencies' => array(
-			'es5-shim',
-			'oojs',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+
+	'oojs-ui.styles' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css',
+			'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css',
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),