From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 27 Dec 2013 22:38:54 +0000 (+0000)
Subject: Merge "Add SVG versions of enhanced recent changes collapse/show arrows"
X-Git-Tag: 1.31.0-rc.0~17482
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=2fd7a383493e2611542689c879878e1369d7ff44;hp=3d047807f60306c45c22ded42daeb3c316249c6e;p=lhc%2Fweb%2Fwiklou.git

Merge "Add SVG versions of enhanced recent changes collapse/show arrows"
---

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 3c844729c3..318448af86 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -53,6 +53,7 @@ class CSSMin {
 		'tif' => 'image/tiff',
 		'tiff' => 'image/tiff',
 		'xbm' => 'image/x-xbitmap',
+		'svg' => 'image/svg+xml',
 	);
 
 	/* Static Methods */
diff --git a/resources/Resources.php b/resources/Resources.php
index 68dc984f72..d79b29b3d7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -756,7 +756,7 @@ return array(
 		'messages' => array( 'htmlform-chosen-placeholder' ),
 	),
 	'mediawiki.icon' => array(
-		'styles' => 'resources/mediawiki/mediawiki.icon.css',
+		'styles' => 'resources/mediawiki/mediawiki.icon.less',
 	),
 	'mediawiki.inspect' => array(
 		'scripts' => 'resources/mediawiki/mediawiki.inspect.js',
diff --git a/resources/mediawiki/images/arrow-collapsed-ltr.svg b/resources/mediawiki/images/arrow-collapsed-ltr.svg
new file mode 100644
index 0000000000..0855534c70
--- /dev/null
+++ b/resources/mediawiki/images/arrow-collapsed-ltr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path d="M4 1.533v9.671l4.752-4.871z" fill="#797979"/></svg>
\ No newline at end of file
diff --git a/resources/mediawiki/images/arrow-collapsed-rtl.svg b/resources/mediawiki/images/arrow-collapsed-rtl.svg
new file mode 100644
index 0000000000..b22b3fc75a
--- /dev/null
+++ b/resources/mediawiki/images/arrow-collapsed-rtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path d="M8 1.533v9.671l-4.752-4.871z" fill="#797979"/></svg>
\ No newline at end of file
diff --git a/resources/mediawiki/images/arrow-expanded.svg b/resources/mediawiki/images/arrow-expanded.svg
new file mode 100644
index 0000000000..e255dba1c4
--- /dev/null
+++ b/resources/mediawiki/images/arrow-expanded.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path d="M1.165 3.624h9.671l-4.871 4.752z" fill="#797979"/></svg>
\ No newline at end of file
diff --git a/resources/mediawiki/mediawiki.icon.css b/resources/mediawiki/mediawiki.icon.css
deleted file mode 100644
index f61b72578a..0000000000
--- a/resources/mediawiki/mediawiki.icon.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* General-purpose icons via CSS. Classes here should be named "mw-icon-*". */
-
-/* For the collapsed and expanded arrows, we also provide selectors to make it
- * easy to use them with jquery.makeCollapsible. */
-.mw-icon-arrow-collapsed,
-.mw-collapsible-arrow.mw-collapsible-toggle-collapsed {
-	/* @embed */
-	background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom;
-}
-
-.mw-icon-arrow-expanded,
-.mw-collapsible-arrow.mw-collapsible-toggle-expanded {
-	/* @embed */
-	background: url(images/arrow-expanded.png) no-repeat left bottom;
-}
diff --git a/resources/mediawiki/mediawiki.icon.less b/resources/mediawiki/mediawiki.icon.less
new file mode 100644
index 0000000000..49f0f70f66
--- /dev/null
+++ b/resources/mediawiki/mediawiki.icon.less
@@ -0,0 +1,19 @@
+/* General-purpose icons via CSS. Classes here should be named "mw-icon-*". */
+
+@import "mediawiki.mixins";
+
+/* For the collapsed and expanded arrows, we also provide selectors to make it
+ * easy to use them with jquery.makeCollapsible. */
+.mw-icon-arrow-collapsed,
+.mw-collapsible-arrow.mw-collapsible-toggle-collapsed {
+	.background-image-svg('images/arrow-collapsed-ltr.svg', 'images/arrow-collapsed-ltr.png');
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+.mw-icon-arrow-expanded,
+.mw-collapsible-arrow.mw-collapsible-toggle-expanded {
+	.background-image-svg('images/arrow-expanded.svg', 'images/arrow-expanded.png');
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}