From 3485269be1749f8bba0c7e13c747d19fb2d91025 Mon Sep 17 00:00:00 2001
From: Stephen Niedzielski <stephen@niedzielski.com>
Date: Thu, 14 Jun 2018 11:51:50 -0500
Subject: [PATCH] Update: add internal and revise external link icons

Bug: T190549
Change-Id: Iad7fdc2f2a730fa8874487c0d83355f21a0bf7ea
---
 includes/skins/SkinMinerva.php                |   1 +
 .../link-external-ltr.svg                     |   1 +
 .../link-external-rtl.svg                     |   1 +
 .../link-internal-ltr.svg                     |   1 +
 .../link-internal-rtl.svg                     |   1 +
 .../images/external-link-ltr-icon.png         | Bin 141 -> 0 bytes
 .../images/external-link-ltr-icon.svg         |   1 -
 .../images/external-link-rtl-icon.png         | Bin 141 -> 0 bytes
 .../images/external-link-rtl-icon.svg         |   1 -
 .../skins.minerva.content.styles/links.less   |   4 +--
 skin.json                                     |  25 ++++++++++++++++++
 11 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 resources/skins.minerva.content.styles.images/link-external-ltr.svg
 create mode 100644 resources/skins.minerva.content.styles.images/link-external-rtl.svg
 create mode 100644 resources/skins.minerva.content.styles.images/link-internal-ltr.svg
 create mode 100644 resources/skins.minerva.content.styles.images/link-internal-rtl.svg
 delete mode 100644 resources/skins.minerva.content.styles/images/external-link-ltr-icon.png
 delete mode 100644 resources/skins.minerva.content.styles/images/external-link-ltr-icon.svg
 delete mode 100644 resources/skins.minerva.content.styles/images/external-link-rtl-icon.png
 delete mode 100644 resources/skins.minerva.content.styles/images/external-link-rtl-icon.svg

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 8f28dce..f46be4d 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1455,6 +1455,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
 			'skins.minerva.base.reset',
 			'skins.minerva.base.styles',
 			'skins.minerva.content.styles',
+			'skins.minerva.content.styles.images',
 			'mediawiki.hlist',
 			'skins.minerva.tablet.styles',
 			'mediawiki.ui.icon',
diff --git a/resources/skins.minerva.content.styles.images/link-external-ltr.svg b/resources/skins.minerva.content.styles.images/link-external-ltr.svg
new file mode 100644
index 0000000..f77812c
--- /dev/null
+++ b/resources/skins.minerva.content.styles.images/link-external-ltr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10" id="svg8"><title id="title2">external link</title><path d="M8.5 8.5h-7v-7H4v-1H1.5a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V6h-1z" id="path4" stroke-width=".5"/><path d="M9.5.5h-4l1.645 1.645L4.28 5.01l.71.71 2.865-2.865L9.5 4.5z" id="path6" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles.images/link-external-rtl.svg b/resources/skins.minerva.content.styles.images/link-external-rtl.svg
new file mode 100644
index 0000000..de583bf
--- /dev/null
+++ b/resources/skins.minerva.content.styles.images/link-external-rtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10" id="svg8"><title id="title2">external link</title><path d="M1.5 6h-1v2.5c0 .55.45 1 1 1h7c.55 0 1-.45 1-1v-7c0-.55-.45-1-1-1H6v1h2.5v7h-7z" id="path4" stroke-width=".5"/><path d="M.5 4.5l1.65-1.65L5 5.7l.7-.7-2.85-2.85L4.5.5h-4z" id="path6" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles.images/link-internal-ltr.svg b/resources/skins.minerva.content.styles.images/link-internal-ltr.svg
new file mode 100644
index 0000000..aeb6d3f
--- /dev/null
+++ b/resources/skins.minerva.content.styles.images/link-internal-ltr.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10" id="svg8"><title id="title2">interwiki link</title><path d="M6 8.5v1h2.5c.55 0 1-.45 1-1v-7c0-.55-.45-1-1-1h-7c-.55 0-1 .45-1 1V4h1V1.5h7v7z" id="path4" stroke-width=".5"/><path d="M3.15 2.85L4.8 4.5.5 8.8l.7.7 4.3-4.3 1.65 1.65v-4z" id="path6" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles.images/link-internal-rtl.svg b/resources/skins.minerva.content.styles.images/link-internal-rtl.svg
new file mode 100644
index 0000000..9cae5c1
--- /dev/null
+++ b/resources/skins.minerva.content.styles.images/link-internal-rtl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10" id="svg8"><title id="title2">interwiki link</title><path d="M1.5 8.5v-7h7V4h1V1.5c0-.55-.45-1-1-1h-7c-.55 0-1 .45-1 1v7c0 .55.45 1 1 1H4v-1z" id="path4" stroke-width=".5"/><path d="M2.85 2.85v4L4.5 5.2l4.3 4.3.7-.7-4.3-4.3 1.65-1.65z" id="path6" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png b/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png
deleted file mode 100644
index 6308383168ccac3158baaf87ffdc530125c7c865..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?PF+hE&|DJ>SU5pupi0Se~U0
zLc5e&&IhW<G}*B@Pf`t1I&xvg(mNlS;>6h{BqBd~ShVvv>@Jq9P@H!n@<7}?#T8fh
m=iR%Y?|Fc4!mk76GI~D`XnAXW(wGG_pTX1B&t;ucLK6V<3ofew

diff --git a/resources/skins.minerva.content.styles/images/external-link-ltr-icon.svg b/resources/skins.minerva.content.styles/images/external-link-ltr-icon.svg
deleted file mode 100644
index 0f4e407..0000000
--- a/resources/skins.minerva.content.styles/images/external-link-ltr-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10"><path fill="#fff" stroke="#36c" d="M.5 3.518h5.982V9.5H.5z"/><path fill="#36c" d="M4.755-.16H9.99v5.39L8.417 6.774l-1.31-1.31L4.383 8.19 1.695 5.5l2.808-2.807-1.31-1.31z"/><path fill="#fff" d="M8.984.845l.022 4.884L7.19 3.91 4.308 6.79 3.08 5.567l2.882-2.88L4.112.833z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles/images/external-link-rtl-icon.png b/resources/skins.minerva.content.styles/images/external-link-rtl-icon.png
deleted file mode 100644
index 5313234e559f0550447b9b98621294dd9b46390a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?PF+hE&|@?Q7&bV8C<uQ*iw!
z|G%2{sm51!ERLSxDAKh-xN(*Ej2jCpSd6pplqj{<_Zpkd_h-smwB=-%>l(|V6GA^<
p71VjOiR%b;_RO}v`0}W}p2Kb}Z%wu@VnFj5JYD@<);T3K0RU5bG3WpQ

diff --git a/resources/skins.minerva.content.styles/images/external-link-rtl-icon.svg b/resources/skins.minerva.content.styles/images/external-link-rtl-icon.svg
deleted file mode 100644
index 061e385..0000000
--- a/resources/skins.minerva.content.styles/images/external-link-rtl-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10"><path fill="#fff" stroke="#36c" d="M9.5 3.518H3.518V9.5H9.5z"/><path fill="#36c" d="M5.245-.16H.01v5.39l1.572 1.544 1.31-1.31L5.617 8.19 8.305 5.5 5.497 2.694l1.31-1.31z"/><path fill="#fff" d="M1.016.845L.994 5.73 2.81 3.91l2.882 2.88L6.92 5.567l-2.882-2.88L5.888.833z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.content.styles/links.less b/resources/skins.minerva.content.styles/links.less
index 317dec7..8218321 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -39,9 +39,9 @@ a {
 		}
 	}
 
+	&.extiw, // internal
 	&.external {
-		/* @embed */
-		.background-image-svg( 'images/external-link-ltr-icon.svg', 'images/external-link-ltr-icon.png' );
+		// background-image is specified by ResourceLoader.
 		background-repeat: no-repeat;
 		background-position: center right;
 		padding-right: 13px;
diff --git a/skin.json b/skin.json
index 9ee3814..19e9cf5 100644
--- a/skin.json
+++ b/skin.json
@@ -171,6 +171,31 @@
 				"resources/skins.minerva.content.styles/styles.less"
 			]
 		},
+		"skins.minerva.content.styles.images": {
+			"class": "ResourceLoaderImageModule",
+			"selectorWithoutVariant": "a.{name}",
+			"selectorWithVariant": "a.{name}",
+			"variants": {
+				"standard": {
+					"color": "#36c",
+					"global": true
+				}
+			},
+			"images": {
+				"external": {
+					"file": {
+						"ltr": "resources/skins.minerva.content.styles.images/link-external-ltr.svg",
+						"rtl": "resources/skins.minerva.content.styles.images/link-external-rtl.svg"
+					}
+				},
+				"extiw": {
+					"file": {
+						"ltr": "resources/skins.minerva.content.styles.images/link-internal-ltr.svg",
+						"rtl": "resources/skins.minerva.content.styles.images/link-internal-rtl.svg"
+					}
+				}
+			}
+		},
 		"skins.minerva.tablet.styles": {
 			"class": "MediaWiki\\Minerva\\ResourceLoaderLessVarFileModule",
 			"targets": [