From 02130112854bf790df211d7911394a1f85616cb8 Mon Sep 17 00:00:00 2001
From: Jan Drewniak <jan.drewniak@gmail.com>
Date: Thu, 6 Jun 2019 14:39:52 +0200
Subject: [PATCH] Updating icons for AMC mode

Replaced the following icons:
- communityportal.svg
- specialpages.svg
- info.svg
- contributions.svg

Bug: T222228
Change-Id: Id7889aeb99abe39bc0efae0a1c6457826015302b
---
 .../communityportal-ltr.svg                   |  1 +
 .../communityportal-rtl.svg                   |  1 +
 .../contributions-ltr.svg                     |  1 +
 .../contributions-rtl.svg                     |  1 +
 .../contributions.svg                         |  1 -
 .../specialpages-ltr.svg                      |  1 +
 .../specialpages-rtl.svg                      |  1 +
 .../specialpages.svg                          |  1 -
 resources/wikimedia.ui/info.svg               |  2 +-
 skin.json                                     | 22 ++++++++++++++++---
 10 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 resources/skins.minerva.mainMenu.icons/communityportal-ltr.svg
 create mode 100644 resources/skins.minerva.mainMenu.icons/communityportal-rtl.svg
 create mode 100644 resources/skins.minerva.mainMenu.icons/contributions-ltr.svg
 create mode 100644 resources/skins.minerva.mainMenu.icons/contributions-rtl.svg
 delete mode 100644 resources/skins.minerva.mainMenu.icons/contributions.svg
 create mode 100644 resources/skins.minerva.mainMenu.icons/specialpages-ltr.svg
 create mode 100644 resources/skins.minerva.mainMenu.icons/specialpages-rtl.svg
 delete mode 100644 resources/skins.minerva.mainMenu.icons/specialpages.svg

diff --git a/resources/skins.minerva.mainMenu.icons/communityportal-ltr.svg b/resources/skins.minerva.mainMenu.icons/communityportal-ltr.svg
new file mode 100644
index 0000000..6dccabb
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/communityportal-ltr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g fill-rule="evenodd"><path d="M14.975 7.052A9.178 9.178 0 0 0 14 7c-3.866 0-7 2.403-7 5.367 0 .21.016.419.047.623a9.996 9.996 0 0 1-1.578-.194C3.46 13.825 1.637 14.226 0 14c1.486-.773 2.39-1.53 2.709-2.268C1.054 10.722 0 9.202 0 7.5 0 4.462 3.358 2 7.5 2c3.936 0 7.164 2.224 7.475 5.052z"/><path d="M17.391 16.213c.45.585 1.32 1.18 2.609 1.787-1.616.213-3.403-.13-5.363-1.025-.21.017-.422.025-.637.025-3.314 0-6-2.015-6-4.5S10.686 8 14 8s6 2.015 6 4.5c0 1.541-1.033 2.902-2.609 3.713zM13.5 12v3h1v-3h-1zm.5-1a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1z"/><path fill="#FFF" fill-rule="nonzero" d="M7.576 4.502c.915 0 1.537.584 1.537 1.4a1.416 1.416 0 0 1-.712 1.26c-.442.285-.567.473-.567.838v.21h-.78v-.25a1.184 1.184 0 0 1 .622-1.187c.417-.278.557-.472.557-.837a.646.646 0 0 0-.185-.465.656.656 0 0 0-.463-.196h-.053a.719.719 0 0 0-.513.19.708.708 0 0 0-.227.496v.052h-.79a1.46 1.46 0 0 1 1.403-1.51 1.22 1.22 0 0 1 .171 0zm-.019 5.562a.62.62 0 0 1-.622-.618.62.62 0 0 1 .622-.618.62.62 0 0 1 .623.618.62.62 0 0 1-.623.618z"/></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/communityportal-rtl.svg b/resources/skins.minerva.mainMenu.icons/communityportal-rtl.svg
new file mode 100644
index 0000000..33959b7
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/communityportal-rtl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g fill-rule="evenodd"><path d="M5.025 7.052C5.344 7.018 5.669 7 6 7c3.866 0 7 2.403 7 5.367 0 .21-.015.419-.046.623a9.996 9.996 0 0 0 1.578-.194C16.54 13.825 18.362 14.226 20 14c-1.486-.773-2.389-1.53-2.709-2.268 1.656-1.01 2.71-2.53 2.71-4.232C20 4.462 16.642 2 12.5 2 8.563 2 5.335 4.224 5.024 7.052z"/><path d="M2.609 16.213c-.45.585-1.32 1.18-2.609 1.787 1.616.213 3.403-.13 5.363-1.025.21.017.422.025.637.025 3.314 0 6-2.015 6-4.5S9.314 8 6 8s-6 2.015-6 4.5c0 1.541 1.033 2.902 2.609 3.713zM6.5 12v3h-1v-3h1zM6 11a.5.5 0 1 1 0-1 .5.5 0 0 1 0 1z"/><path fill="#FFF" fill-rule="nonzero" d="M12.462 4.502c.915 0 1.538.584 1.538 1.4a1.416 1.416 0 0 1-.713 1.26c-.442.285-.567.473-.567.838v.21h-.78v-.25a1.184 1.184 0 0 1 .622-1.187c.417-.278.557-.472.557-.837a.646.646 0 0 0-.185-.465.656.656 0 0 0-.463-.196h-.052a.719.719 0 0 0-.514.19.708.708 0 0 0-.227.496v.052h-.79a1.46 1.46 0 0 1 1.403-1.51 1.22 1.22 0 0 1 .171 0zm-.019 5.562a.62.62 0 0 1-.622-.618.62.62 0 0 1 .622-.618.62.62 0 0 1 .623.618.62.62 0 0 1-.623.618z"/></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/contributions-ltr.svg b/resources/skins.minerva.mainMenu.icons/contributions-ltr.svg
new file mode 100644
index 0000000..1af18f8
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/contributions-ltr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g><path d="M6 15h3v2H6z"/><path d="M6 9h5v2H6z"/><path d="M6 3h11v2H6z"/><circle cx="2" cy="4" r="2"/><circle cx="2" cy="10" r="2"/><circle cx="2" cy="16" r="2"/><path d="M15.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="15.444" cy="10.5" r="2.5"/></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/contributions-rtl.svg b/resources/skins.minerva.mainMenu.icons/contributions-rtl.svg
new file mode 100644
index 0000000..e3d42a9
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/contributions-rtl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g><path d="M14 15h-3v2h3z"/><path d="M14 9H9v2h5z"/><path d="M14 3H3v2h11z"/><path d="M18 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm0 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm0 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zM4.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="4.444" cy="10.5" r="2.5"/></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/contributions.svg b/resources/skins.minerva.mainMenu.icons/contributions.svg
deleted file mode 100644
index b9be3f6..0000000
--- a/resources/skins.minerva.mainMenu.icons/contributions.svg
+++ /dev/null
@@ -1 +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 fill="#54595d" fill-rule="evenodd" d="M13.424 3a8.565 8.565 0 0 0-8.567 8.571H2l3.71 3.71.066.138 3.843-3.848H6.762a6.668 6.668 0 0 1 13.333 0 6.668 6.668 0 0 1-6.666 6.667 6.64 6.64 0 0 1-4.71-1.957l-1.348 1.348a8.517 8.517 0 0 0 6.053 2.514A8.573 8.573 0 0 0 22 11.571C22 6.838 18.162 3 13.424 3zm-.948 4.762v4.762l4.076 2.419.686-1.157-3.333-1.976V7.762h-1.429z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/specialpages-ltr.svg b/resources/skins.minerva.mainMenu.icons/specialpages-ltr.svg
new file mode 100644
index 0000000..efb3b24
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/specialpages-ltr.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M5 0v2h11v14h2V2a2 2 0 0 0-2-2H5z"/><path d="M13 20H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2zm-6.5-3.5l.41-1.09L8 15l-1.09-.41-.41-1.09-.41 1.09L5 15l1.09.41.41 1.09zm2.982-.949l.952-2.561 2.53-.964-2.53-.964L9.482 8.5l-.952 2.562-2.53.964 2.53.964.952 2.561zM6 10.5l.547-1.453L8 8.5l-1.453-.547L6 6.5l-.547 1.453L4 8.5l1.453.547L6 10.5z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/specialpages-rtl.svg b/resources/skins.minerva.mainMenu.icons/specialpages-rtl.svg
new file mode 100644
index 0000000..08e8d56
--- /dev/null
+++ b/resources/skins.minerva.mainMenu.icons/specialpages-rtl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M15 0v2H4v14H2V2a2 2 0 0 1 2-2h11z"/><path d="M7 20a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v13a2 2 0 0 1-2 2H7zm6.5-3.5l.41-1.09L15 15l-1.09-.41-.41-1.09-.41 1.09L12 15l1.09.41.41 1.09zm-2.982-.949l.952-2.561 2.53-.964-2.53-.964-.952-2.562-.952 2.562-2.53.964 2.53.964.952 2.561zM14 10.5l.547-1.453L16 8.5l-1.453-.547L14 6.5l-.547 1.453L12 8.5l1.453.547L14 10.5z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.mainMenu.icons/specialpages.svg b/resources/skins.minerva.mainMenu.icons/specialpages.svg
deleted file mode 100644
index d4fc074..0000000
--- a/resources/skins.minerva.mainMenu.icons/specialpages.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="22" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M19.8 2.177H11L8.8 0H2.2C.99 0 0 .98 0 2.177V15.24c0 1.197.99 2.177 2.2 2.177h17.6c1.21 0 2.2-.98 2.2-2.177V4.354c0-1.197-.99-2.177-2.2-2.177zm-2.266 11.974L14.3 12.279l-3.234 1.872.858-3.625-2.849-2.438 3.751-.316L14.3 4.354l1.474 3.418 3.751.316-2.849 2.438.858 3.625z" fill="#4A4F53"/></svg>
\ No newline at end of file
diff --git a/resources/wikimedia.ui/info.svg b/resources/wikimedia.ui/info.svg
index 4f3ad8e..1fec150 100644
--- a/resources/wikimedia.ui/info.svg
+++ b/resources/wikimedia.ui/info.svg
@@ -1 +1 @@
-<?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>info</title><path d="M9.5 16A6.61 6.61 0 0 1 3 9.5 6.61 6.61 0 0 1 9.5 3 6.61 6.61 0 0 1 16 9.5 6.63 6.63 0 0 1 9.5 16zm0-14A7.5 7.5 0 1 0 17 9.5 7.5 7.5 0 0 0 9.5 2zm.5 6v4.08h1V13H8.07v-.92H9V9H8V8zM9 6h1v1H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 20C4.477 20 0 15.523 0 10S4.477 0 10 0s10 4.477 10 10-4.477 10-10 10zM9 9v6h2V9H9zm1-2a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/></svg>
\ No newline at end of file
diff --git a/skin.json b/skin.json
index 91cf932..e25583b 100644
--- a/skin.json
+++ b/skin.json
@@ -398,6 +398,7 @@
 		"skins.minerva.mainMenu.icons": {
 			"class": "ResourceLoaderImageModule",
 			"selector": ".mw-ui-icon-minerva-{name}:before",
+			"defaultColor": "#4A4F53",
 			"images": {
 				"login": "resources/skins.minerva.mainMenu.icons/login.svg",
 				"home": "resources/skins.minerva.mainMenu.icons/home.svg",
@@ -406,9 +407,24 @@
 				"random": "resources/skins.minerva.mainMenu.icons/random.svg",
 				"settings": "resources/skins.minerva.mainMenu.icons/settings.svg",
 				"watchlist": "resources/skins.minerva.mainMenu.icons/watchlist.svg",
-				"contributions": "resources/skins.minerva.mainMenu.icons/contributions.svg",
-				"specialpages": "resources/skins.minerva.mainMenu.icons/specialpages.svg",
-				"communityportal": "resources/skins.minerva.mainMenu.icons/communityportal.svg"
+				"contributions": {
+					"file": {
+						"ltr": "resources/skins.minerva.mainMenu.icons/contributions-ltr.svg",
+						"rtl":  "resources/skins.minerva.mainMenu.icons/contributions-rtl.svg"
+					}
+				},
+				"specialpages": {
+					"file": {
+						"ltr":"resources/skins.minerva.mainMenu.icons/specialpages-ltr.svg",
+						"rtl": "resources/skins.minerva.mainMenu.icons/specialpages-rtl.svg"
+					}
+				},
+				"communityportal": {
+					"file": {
+						"ltr": "resources/skins.minerva.mainMenu.icons/communityportal-ltr.svg",
+						"rtl": "resources/skins.minerva.mainMenu.icons/communityportal-rtl.svg"
+					}
+				}
 			}
 		},
 		"skins.minerva.mainMenu.styles": {