From 3b3042891e0d32d3f3f848ec3618ef3142dd101d Mon Sep 17 00:00:00 2001 From: m4tx Date: Fri, 27 Dec 2013 12:43:17 +0100 Subject: [PATCH] Add SVG versions of enhanced recent changes collapse/show arrows Bug: 35344 Change-Id: I1fcc255691048cb8929a68096e1e0e56e934f020 --- includes/libs/CSSMin.php | 1 + resources/Resources.php | 2 +- resources/mediawiki/images/arrow-collapsed-ltr.svg | 1 + resources/mediawiki/images/arrow-collapsed-rtl.svg | 1 + resources/mediawiki/images/arrow-expanded.svg | 1 + .../{mediawiki.icon.css => mediawiki.icon.less} | 12 ++++++++---- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 resources/mediawiki/images/arrow-collapsed-ltr.svg create mode 100644 resources/mediawiki/images/arrow-collapsed-rtl.svg create mode 100644 resources/mediawiki/images/arrow-expanded.svg rename resources/mediawiki/{mediawiki.icon.css => mediawiki.icon.less} (53%) diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php index 4f142fc753..8d8aa2e3a7 100644 --- a/includes/libs/CSSMin.php +++ b/includes/libs/CSSMin.php @@ -52,6 +52,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 31714a60de..2f07721e63 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -694,7 +694,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 @@ + \ 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 @@ + \ 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 @@ + \ No newline at end of file diff --git a/resources/mediawiki/mediawiki.icon.css b/resources/mediawiki/mediawiki.icon.less similarity index 53% rename from resources/mediawiki/mediawiki.icon.css rename to resources/mediawiki/mediawiki.icon.less index f61b72578a..49f0f70f66 100644 --- a/resources/mediawiki/mediawiki.icon.css +++ b/resources/mediawiki/mediawiki.icon.less @@ -1,15 +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 { - /* @embed */ - background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom; + .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 { - /* @embed */ - background: url(images/arrow-expanded.png) no-repeat left bottom; + .background-image-svg('images/arrow-expanded.svg', 'images/arrow-expanded.png'); + background-repeat: no-repeat; + background-position: left bottom; } -- 2.20.1