From 7e228ecb02e73798fb7d251bb9da2e241fa4c959 Mon Sep 17 00:00:00 2001
From: Volker E <volker.e@wikimedia.org>
Date: Thu, 7 Sep 2017 16:54:26 -0700
Subject: [PATCH] Use consistent close icon

Using close icon of WikimediaUI icon collection, which is also
already in use by OOUI.

Bug: T50067
Bug: T175295
Change-Id: I83e435a7215708c5a5eae77eeca29632ed64f608
---
 resources/css/ext.uls.languagesettings.less |   9 ++++-----
 resources/images/close.png                  | Bin 180 -> 168 bytes
 resources/images/close.svg                  |   6 +++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/css/ext.uls.languagesettings.less b/resources/css/ext.uls.languagesettings.less
index 41a88e56..974316d8 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -142,11 +142,10 @@ label.checkbox input[type='checkbox'] {
 }
 
 .uls-icon-close {
-	background: transparent url( ../images/close.png ) no-repeat scroll center center;
-	background-image: -webkit-linear-gradient( transparent, transparent ), url( ../images/close.svg );
-	/* @embed */
-	background-image: linear-gradient( transparent, transparent ), url( ../images/close.svg );
+	background: transparent no-repeat center center;
+	.background-image-svg( '../images/close.svg', '../images/close.png' );
+	background-size: 16px 16px; // Support: Android Browser <= 4.3, doesn't accept it as part of `background` shorthand
 	float: right;
-	padding: 15px;
+	padding: 16px;
 	cursor: pointer;
 }
diff --git a/resources/images/close.png b/resources/images/close.png
index 84631c3db3679ae8594810977348a42fac7889b5..80dde95155eb325c0e68ef3935d7fae040a2d4ca 100644
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzsp#Yx{S0H`<{CNQZ0U*P{!QuV;
z_j6cwvI04bB|(0{3=Yq3qyafDo-U3d9M_W%Fgmd~s4Ui=P!Psq*y`iZGLa!5KvIK2
zX<>~4>ocd8gG~a76BI%u)H)KBL=?6t@;Gl~N;EuVd7|$KAH)CioW6X~SCoO~F?hQA
KxvX<aXaWEs9xc@X

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K23?xtf=%@rzq5(c3uK)l4kBEo}1p_$a1!LED
zpaQm%AirP+g$D<0es9!X+XfWz@N{tu;fPL7FiA;BU=VcjWD+=}<2$i2Q1@(uqlT_0
zLyM!0sObWY06Se#l>-byOxy+rJC-fAGEnF~aOFVh!LyDtcs6sVSu=3V5*8Mpan%iI
OCWEJ|pUXO@geCyh?lu1a

diff --git a/resources/images/close.svg b/resources/images/close.svg
index b39a0ff7..7f755112 100644
--- a/resources/images/close.svg
+++ b/resources/images/close.svg
@@ -1 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="13.592" height="13.592"><g transform="translate(-578.659 -309.301)" fill="#555"><rect width="3.204" height="16.018" x="188.862" y="629.484" transform="rotate(-45)"/><rect width="3.204" height="16.018" x="-639.095" y="182.455" transform="matrix(-.707 -.707 .707 -.707 0 0)"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+	<path d="M3.636 2.222l14.142 14.142-1.414 1.414L2.222 3.636z"/>
+	<path d="M17.778 3.636L3.636 17.778l-1.414-1.414L16.364 2.222z"/>
+</svg>