From 02f6652f38d8bb107a1f814ff4a1e1d99db8cd53 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Sat, 30 Mar 2019 23:15:48 +0000
Subject: [PATCH] Update help icon from OOUI

The normal 'help' icon no longer has a ring outline,
so use 'helpNotice' as this looks less confusing in
an unframed button.

Bug: T219719
Change-Id: I6af23236e9d3983cab6d2ce331dd67e3b42913ff
---
 resources/src/mediawiki.helplink/helplink.less    |  10 +++++-----
 resources/src/mediawiki.helplink/images/help.png  | Bin 405 -> 0 bytes
 resources/src/mediawiki.helplink/images/help.svg  |   5 -----
 .../src/mediawiki.helplink/images/helpNotice.png  | Bin 0 -> 435 bytes
 .../src/mediawiki.helplink/images/helpNotice.svg  |   7 +++++++
 5 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 resources/src/mediawiki.helplink/images/help.png
 delete mode 100644 resources/src/mediawiki.helplink/images/help.svg
 create mode 100644 resources/src/mediawiki.helplink/images/helpNotice.png
 create mode 100644 resources/src/mediawiki.helplink/images/helpNotice.svg

diff --git a/resources/src/mediawiki.helplink/helplink.less b/resources/src/mediawiki.helplink/helplink.less
index 4eed90ae3f..dd5010624b 100644
--- a/resources/src/mediawiki.helplink/helplink.less
+++ b/resources/src/mediawiki.helplink/helplink.less
@@ -1,11 +1,11 @@
 @import 'mediawiki.mixins';
 
 #mw-indicator-mw-helplink a {
-	.background-image-svg('images/help.svg', 'images/help.png');
-	background-repeat: no-repeat;
+	.background-image-svg('images/helpNotice.svg', 'images/helpNotice.png');
 	background-position: left center;
-	padding-left: 28px;
+	background-repeat: no-repeat;
 	display: inline-block;
-	height: 24px;
-	line-height: 24px;
+	height: 20px;
+	padding-left: 25px;
+	line-height: 20px;
 }
diff --git a/resources/src/mediawiki.helplink/images/help.png b/resources/src/mediawiki.helplink/images/help.png
deleted file mode 100644
index 301e23b879c673f5c929ce2d8657b0522f6ddcdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00048Nkl<Zcmdtg
zv$9=L9KhkQj9tf08QXT9M~ICsb)39MY}>43+y39LxL7m$xIDj^ui98_RP{Ax5_`DL
z^IF%~%|segQDeDJB;MDG#2rRaRvY+Fu#cIvq^_3C<{-g8R#Q^z3EnV?Vom2A!72(i
zmjAq=7inFX#(3J2)|YquV??0?y-(zr`D*?UwSKdiw3!6A$k`-<eWZ;cxWEv`@}6KS
zX-5dgkZBLWOwyXMgwE7;nqU!W^9i<-={iA63N@GDQI2=p5nLqGbKX;^ZhYkveaO`p
z9#uNPE`m*{yaBG2utg6D29c}w1Q*D(n_xEi`pJKqldFXUTgfz$;2@QDoM1GW8gqwW
zI=Kocc)PBXw^97#9ev9fU;rQZ%TNlon&2HXDb`#*5G<plR`HME2=i%2UF})Oae}`r
zqpU`7i%5K_6^ZK%rQ*i0or^rGb%Cvnrpl`U$(VwZWHgW100000NkvXXu0mjf#&o?P

diff --git a/resources/src/mediawiki.helplink/images/help.svg b/resources/src/mediawiki.helplink/images/help.svg
deleted file mode 100644
index 4fc6a0cdc8..0000000000
--- a/resources/src/mediawiki.helplink/images/help.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-	<path d="M12.001 2.085a9.914 9.914 0 0 0-9.916 9.916c0 5.476 4.438 9.914 9.916 9.914a9.913 9.913 0 0 0 9.914-9.914c0-5.478-4.438-9.916-9.914-9.916zm.001 18a8.083 8.083 0 1 1 0-16.167 8.083 8.083 0 0 1 0 16.167z"/>
-	<path d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719C11.047 12.531 11 15 11 15h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437zM11 16h2v2h-2z"/>
-</svg>
diff --git a/resources/src/mediawiki.helplink/images/helpNotice.png b/resources/src/mediawiki.helplink/images/helpNotice.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef1d713eca0579ca11ffba3d399ff82c0898c96d
GIT binary patch
literal 435
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR<w@2nP_<aHMnq`J4qFk;M!Q
zd`Cc-ajG_-G*D2o#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDFy~c15X#n
z5R22v2?zKr8Z4MP!kIqSD*R(R65sHHO+cUdk%2;5vVu?x!$)O>fBp>j86PRsuo*Ib
zR8it_I(|1`uS9~8WZS_4akKoS;2$hf)0iC2upimxut&Q67Q>9h1qW&yTn{=ch_NNP
zDSTs1^4FLx*}<O}ST8LWC}@#$rakILr%D)?=;uQV)u(X!`^Yw5y6BN)7VyiG&-R~=
z!y$?GCvpn^xOweU3<WM6TX>wsrAFOIZT7-hM;1P8^*yUTp-J9F!c0DEhLVZn<Dl=N
zOJ3*+vPC)Z+W0x#jSW~bM@h-ru4$PwH`6P>hu&sS9t2EiT;n3bX3*e&w)TmTMh6#L
z(vs(OTzhV{um15${jz~ujiD%quEalK!L-IB({3&3;A$89z98nKaEHCa&C?5uB33gn
ZoSXIb1V`#E7GMA~c)I$ztaD0e0s!f=nL_{o

literal 0
HcmV?d00001

diff --git a/resources/src/mediawiki.helplink/images/helpNotice.svg b/resources/src/mediawiki.helplink/images/helpNotice.svg
new file mode 100644
index 0000000000..8f0c3dc844
--- /dev/null
+++ b/resources/src/mediawiki.helplink/images/helpNotice.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+	<title>
+		help
+	</title>
+	<path d="M10 0a10 10 0 1 0 10 10A10 10 0 0 0 10 0zm1 16H9v-2h2zm2.71-7.6a2.64 2.64 0 0 1-.33.74 3.16 3.16 0 0 1-.48.55l-.54.48c-.21.18-.41.35-.58.52a2.54 2.54 0 0 0-.47.56A2.3 2.3 0 0 0 11 12a3.79 3.79 0 0 0-.11 1H9.08a8.9 8.9 0 0 1 .07-1.25 3.28 3.28 0 0 1 .25-.9 2.79 2.79 0 0 1 .41-.67 4 4 0 0 1 .58-.58c.17-.16.34-.3.51-.44a3 3 0 0 0 .43-.44 1.83 1.83 0 0 0 .3-.55 2 2 0 0 0 .11-.72 2.06 2.06 0 0 0-.17-.86 1.71 1.71 0 0 0-1-.9 1.7 1.7 0 0 0-.5-.1 1.77 1.77 0 0 0-1.53.68 3 3 0 0 0-.5 1.82H6.16a4.74 4.74 0 0 1 .28-1.68 3.56 3.56 0 0 1 .8-1.29 3.88 3.88 0 0 1 1.28-.83A4.59 4.59 0 0 1 10.18 4a4.44 4.44 0 0 1 1.44.23 3.51 3.51 0 0 1 1.15.65 3.08 3.08 0 0 1 .78 1.06 3.54 3.54 0 0 1 .29 1.45 3.39 3.39 0 0 1-.13 1.01z"/>
+</svg>
-- 
2.20.1