From 2e8ea6219fa26f7febd47d658e71509ee95edb3a Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Thu, 28 Sep 2017 13:30:43 -0500
Subject: [PATCH] Update SVGs for page actions and restore locked edit icon
 behavior

The locked edit icon will now show on protected pages.

Additional changes:
* userpage and userNormal was not minified. This has been fixed.

Bug: T174105
Change-Id: I0ef9c4cf3ea6cd1c550023fdf99581b665b459b2
---
 includes/skins/SkinMinerva.php                              | 3 ++-
 resources/skins.minerva.icons.images.scripts/userNormal.svg | 2 +-
 resources/skins.minerva.icons.images.scripts/watch.svg      | 2 +-
 resources/skins.minerva.icons.images.scripts/watched.svg    | 2 +-
 resources/skins.minerva.icons.images/edit.svg               | 2 +-
 resources/skins.minerva.icons.images/editLocked.svg         | 2 +-
 resources/skins.minerva.icons.images/languageSwitcher.svg   | 2 +-
 resources/skins.minerva.userpage.icons/userpage.svg         | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 221450810..d6b6e1459 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1101,11 +1101,12 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
 			// Full wikitext editing is not possible via the api and hard on mobile devices.
 			$editArgs['section'] = self::LEAD_SECTION_NUMBER;
 		}
+		$userCanEdit = $title->quickUserCan( 'edit', $this->getUser() );
 		return [
 			'id' => 'ca-edit',
 			'text' => '',
 			'itemtitle' => $this->msg( 'mobile-frontend-pageaction-edit-tooltip' ),
-			'class' => MinervaUI::iconClass( 'edit-enabled', 'element' ),
+			'class' => MinervaUI::iconClass( $userCanEdit ? 'edit-enabled' : 'edit', 'element' ),
 			'links' => [
 				'edit' => [
 					'href' => $title->getLocalURL( $editArgs )
diff --git a/resources/skins.minerva.icons.images.scripts/userNormal.svg b/resources/skins.minerva.icons.images.scripts/userNormal.svg
index 40112c4df..155377f03 100644
--- a/resources/skins.minerva.icons.images.scripts/userNormal.svg
+++ b/resources/skins.minerva.icons.images.scripts/userNormal.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" viewBox="271.5 72.8 16 16"><path fill="#c8ccd1" d="M273.59 72.8c-2.03 0-2.09 1.907-2.09 2.032V88.8h13.91c2.03 0 2.09-1.907 2.09-2.032V72.8h-13.91z"/><g fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)"><circle cx="437" cy="234.1" r="28"/><circle cx="553.5" cy="234.1" r="28"/></g><path fill="#fff" d="M279.88 85.338c-1.8 0-3.533-.617-4.583-1.61-.248-.247-.248-.68 0-.927s.68-.243.928 0c.806.81 2.167 1.24 3.654 1.24 1.42 0 2.784-.43 3.59-1.24.244-.243.68-.243.924 0s.248.68 0 .93c-1.113.99-2.722 1.61-4.52 1.61z"/></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" viewBox="271.5 72.8 16 16"><path fill="#c8ccd1" d="M273.59 72.8c-2.03 0-2.09 1.907-2.09 2.032V88.8h13.91c2.03 0 2.09-1.907 2.09-2.032V72.8h-13.91z"/><g fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)"><circle cx="437" cy="234.1" r="28"/><circle cx="553.5" cy="234.1" r="28"/></g><path fill="#fff" d="M279.88 85.338c-1.8 0-3.533-.617-4.583-1.61-.248-.247-.248-.68 0-.927s.68-.243.928 0c.806.81 2.167 1.24 3.654 1.24 1.42 0 2.784-.43 3.59-1.24.244-.243.68-.243.924 0s.248.68 0 .93c-1.113.99-2.722 1.61-4.52 1.61z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images.scripts/watch.svg b/resources/skins.minerva.icons.images.scripts/watch.svg
index c2257e9f8..ed9baa961 100644
--- a/resources/skins.minerva.icons.images.scripts/watch.svg
+++ b/resources/skins.minerva.icons.images.scripts/watch.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="23" viewBox="0 0 24 23"><title>star</title><path fill="#72777d" fill-rule="evenodd" d="M12 4.512l2.267 4.777 5.333.66-3.6 3.72.667 5.173L12 16.588l-4.8 2.256.8-5.175-3.733-3.72 5.2-.665L12 4.51zM12 0L8.267 7.432 0 8.626l6 5.84-1.467 8.094L12 18.58l7.333 3.98L18 14.332l6-5.84L15.6 7.3 12 0z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="Page-1" fill="none" fill-rule="evenodd"><g id="watchstar" fill="#54595D"><path d="M8.91 9H1l6.007 5.86L5 23l7-4.319L19 23l-1.995-8.14L23 9h-7.909l-3.09-8-3.09 8zm.054 5.188L5.312 11h4.818L12 5.747 13.881 11h4.82l-3.653 3.2 1.099 4.956L12 16.516l-4.136 2.627 1.1-4.955z" id="Page-1"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images.scripts/watched.svg b/resources/skins.minerva.icons.images.scripts/watched.svg
index 85303c649..321d34d0b 100644
--- a/resources/skins.minerva.icons.images.scripts/watched.svg
+++ b/resources/skins.minerva.icons.images.scripts/watched.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="23" viewBox="0 0 24 23"><title>watchlist-filled</title><path fill="#00af89" fill-rule="evenodd" d="M12 0L8.267 7.432 0 8.626l6 5.84-1.467 8.094L12 18.58l7.333 3.98L18 14.332l6-5.84L15.6 7.3 12 0z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="Page-1" fill="none" fill-rule="evenodd"><g id="watchstar-selected" fill="#00AF89"><path id="Page-1" d="M8.91 9H1l6.007 5.86L5 23l7-4.319L19 23l-1.995-8.14L23 9h-7.909l-3.09-8z"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images/edit.svg b/resources/skins.minerva.icons.images/edit.svg
index 1bb16b1e5..963df8fa0 100644
--- a/resources/skins.minerva.icons.images/edit.svg
+++ b/resources/skins.minerva.icons.images/edit.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 -410 2048 2048"><path fill="#72777d" d="M307.05 1073.838q32.507 22.505 97.522 87.52L1659.846 26.108q-33.757-60.014-101.272-82.52zm-135.03-51.26L1563.576-225.197q156.284 26.256 276.31 155.034Q1959.91 58.617 1968.663 217.4L575.858 1470.177 60.746 1525.19z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="Page-1" fill="none" fill-rule="evenodd"><g id="edit" fill="#54595D"><path d="M6.387 17.996l-1.12-1.12 12.38-12.38 1.12 1.118-12.38 12.382zM21.692 6.83l-3.52-3.521a1.058 1.058 0 0 0-1.495 0L3 16.985V22h5.015L21.692 8.323a1.06 1.06 0 0 0 0-1.493z" id="Fill-1"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images/editLocked.svg b/resources/skins.minerva.icons.images/editLocked.svg
index 09d66d600..34bb18538 100644
--- a/resources/skins.minerva.icons.images/editLocked.svg
+++ b/resources/skins.minerva.icons.images/editLocked.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="#72777d" viewBox="0 -410 2048 2048"><path d="M1670.264-159.32q-108.757 0-108.757 124.825l1.236 109.993h216.278l-1.23-109.993q1.238-124.824-107.52-124.824zm0-144.596q102.577 0 171.787 77.86 69.21 77.86 69.21 190.324v111.23h108.76v484.46h-699.5V75.5h109.994V-36.968q0-112.464 69.21-189.09 69.208-76.623 170.55-77.86zm-469.632 984.992h170.55l-795.9 716.807-510.417 55.614L173.622 955.44l1027.01-918.254v164.37l-892.3 805.79q32.132 22.245 96.398 86.51l795.902-719.277v306.49z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="Page-1" fill="none" fill-rule="evenodd"><g id="edit-locked" fill="#72777D"><path d="M14 15h.75l-7 7H3v-4.75l9-9V13a2 2 0 0 0 2 2zm7.036-8c.532 0 .964.432.964.964v4.072a.965.965 0 0 1-.964.964h-6.072a.965.965 0 0 1-.964-.964V7.964c0-.532.432-.964.964-.964h.536V5.5S15.5 3 18 3s2.5 2.5 2.5 2.5V7h.536zM19.5 7V5.75C19.5 5 19.5 4 18 4s-1.5 1-1.5 1.75V7h3zM18 11a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images/languageSwitcher.svg b/resources/skins.minerva.icons.images/languageSwitcher.svg
index b5804434f..1cd53361e 100644
--- a/resources/skins.minerva.icons.images/languageSwitcher.svg
+++ b/resources/skins.minerva.icons.images/languageSwitcher.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="28" height="21" viewBox="0 0 28 21"><title>language switcher</title><path fill="#72777d" fill-rule="evenodd" d="M23.89 16l1.72 5h2.37L22.44 3.94h-3.3L13.34 21h2.37l1.59-5h6.59zm-3.3-10.09l2.77 8.13h-5.54l2.77-8.13zM8.2 2.63h1.18L8.07 0H5.43l.66 1.31A2.34 2.34 0 0 0 8.2 2.63zM16.51 4H.15v2h2.51c.79 2.27 1.98 4.24 3.69 6.08-1.85 1.44-4.09 2.23-6.33 3.01l.66 1.97c2.64-.79 5.01-1.83 7.25-3.54 1.19.92 2.77 1.84 4.62 2.36l.66-1.97c-1.45-.39-2.64-1.05-3.69-1.83 2.5-2.5 3.29-4.99 3.42-5.25l.27-.83h2.64l.66-2zm-8.58 6.67C6.61 9.41 5.43 7.77 4.9 6h6.2c-.66 1.77-1.85 3.28-3.17 4.67-2.11-2.15 0 0 0 0z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g id="Page-1" fill="none" fill-rule="evenodd"><g id="language-selection" fill="#54595D"><path d="M21.047 20H23L18.443 5h-2.712l-4.774 15h1.953l1.302-4.05h5.424L21.047 20zM16.925 7.062l2.277 6.977h-4.556l2.279-6.975v-.002zM6.726 4c-.738 0-1.411-.187-1.735-.875L4.447 2h2.17l1.085 2h-.976zm4.126 9.926l-.544 1.685a11.228 11.228 0 0 1-3.797-2.024c-1.848 1.462-3.798 2.362-5.968 3.038L0 14.937c1.842-.675 3.687-1.35 5.208-2.588a14.16 14.16 0 0 1-3.038-5.29H.108V5H13.56l-.543 2.062h-2.17c-.382 1.71-1.556 3.802-3.038 5.29.872.674 1.846 1.237 3.042 1.574zM9.116 7.062H4.015c.434 1.576 1.41 3.038 2.496 4.163 1.148-1.286 2.005-2.516 2.603-4.162l.002-.001z" id="Combined-Shape"/></g></g></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.userpage.icons/userpage.svg b/resources/skins.minerva.userpage.icons/userpage.svg
index 1a86b83f6..161686a16 100644
--- a/resources/skins.minerva.userpage.icons/userpage.svg
+++ b/resources/skins.minerva.userpage.icons/userpage.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="88" height="118" viewBox="0 0 88 118"><title>userpage</title><g fill-rule="evenodd"><path d="M86.156 18.4L69.682 2.166c-.762-.75-1.615-1.612-3.31-1.612H5.608C2.61.554.174 3.03.174 6.07v106.275c0 3.022 2.436 5.485 5.434 5.485h76.73c3.006 0 5.453-2.463 5.453-5.485V21.95c-.01-1.715-.83-2.758-1.63-3.55zM83.9 20.43H67.886V4.65L83.9 20.43zm-1.56 94.38H5.607c-1.32 0-2.398-1.107-2.398-2.465V6.08c0-1.347 1.093-2.484 2.393-2.484h59.24V21.95a1.51 1.51 0 0 0 1.514 1.512H84.74v88.883c0 1.358-1.077 2.464-2.405 2.464z"/><path d="M64.76 94.702H20.523a1.51 1.51 0 0 0 0 3.02h44.24a1.51 1.51 0 0 0 1.515-1.51c0-.84-.67-1.51-1.516-1.51zm.196-24.457c-12.534-5.314-14.635-7.543-14.99-8.153V60.46c1.4-1.725 2.497-3.955 3.207-6.498 1.88-1.797 2.257-4.857.874-7.15v-5.12c0-7.118-4.04-11.204-11.1-11.204-6.947 0-11.102 4.187-11.102 11.204v5.12c-1.37 2.293-.993 5.343.884 7.14.71 2.543 1.81 4.775 3.21 6.5v1.64c-.39.69-2.62 2.88-15.017 8.153-1.168.506-1.93 1.703-1.93 3.042v6.225c0 1.817 1.392 3.286 3.097 3.286h41.7c1.715 0 3.106-1.48 3.106-3.286v-6.225c.02-1.34-.752-2.536-1.94-3.042zm-1.076 9.277a.375.375 0 0 1-.09.265l-41.632.01c-.032-.01-.102-.112-.102-.275v-6.225c0-.153.07-.254.09-.264 13.875-5.9 16.262-8.405 16.79-10.23.04-.133.06-.275.06-.416v-2.484c0-.366-.13-.732-.386-1.004-1.352-1.527-2.407-3.65-3.047-6.16a1.507 1.507 0 0 0-.538-.824c-1.076-.83-1.28-2.585-.416-3.75.19-.263.29-.58.29-.904V41.69c0-3.73 1.4-8.17 8.063-8.17 5.35 0 8.063 2.745 8.063 8.17v5.576c0 .325.1.64.296.904.954 1.29.546 3.013-.408 3.75a1.52 1.52 0 0 0-.54.825c-.64 2.505-1.696 4.634-3.048 6.155-.24.27-.384.637-.384 1.003v2.484c0 .14.02.273.058.405.5 1.755 2.877 4.34 16.78 10.23.02.01.103.1.103.265v6.235h-.01z"/></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="88" height="118" viewBox="0 0 88 118"><title>userpage</title><g fill-rule="evenodd"><path d="M86.156 18.4L69.682 2.166c-.762-.75-1.615-1.612-3.31-1.612H5.608C2.61.554.174 3.03.174 6.07v106.275c0 3.022 2.436 5.485 5.434 5.485h76.73c3.006 0 5.453-2.463 5.453-5.485V21.95c-.01-1.715-.83-2.758-1.63-3.55zM83.9 20.43H67.886V4.65L83.9 20.43zm-1.56 94.38H5.607c-1.32 0-2.398-1.107-2.398-2.465V6.08c0-1.347 1.093-2.484 2.393-2.484h59.24V21.95a1.51 1.51 0 0 0 1.514 1.512H84.74v88.883c0 1.358-1.077 2.464-2.405 2.464z"/><path d="M64.76 94.702H20.523a1.51 1.51 0 0 0 0 3.02h44.24a1.51 1.51 0 0 0 1.515-1.51c0-.84-.67-1.51-1.516-1.51zm.196-24.457c-12.534-5.314-14.635-7.543-14.99-8.153V60.46c1.4-1.725 2.497-3.955 3.207-6.498 1.88-1.797 2.257-4.857.874-7.15v-5.12c0-7.118-4.04-11.204-11.1-11.204-6.947 0-11.102 4.187-11.102 11.204v5.12c-1.37 2.293-.993 5.343.884 7.14.71 2.543 1.81 4.775 3.21 6.5v1.64c-.39.69-2.62 2.88-15.017 8.153-1.168.506-1.93 1.703-1.93 3.042v6.225c0 1.817 1.392 3.286 3.097 3.286h41.7c1.715 0 3.106-1.48 3.106-3.286v-6.225c.02-1.34-.752-2.536-1.94-3.042zm-1.076 9.277a.375.375 0 0 1-.09.265l-41.632.01c-.032-.01-.102-.112-.102-.275v-6.225c0-.153.07-.254.09-.264 13.875-5.9 16.262-8.405 16.79-10.23.04-.133.06-.275.06-.416v-2.484c0-.366-.13-.732-.386-1.004-1.352-1.527-2.407-3.65-3.047-6.16a1.507 1.507 0 0 0-.538-.824c-1.076-.83-1.28-2.585-.416-3.75.19-.263.29-.58.29-.904V41.69c0-3.73 1.4-8.17 8.063-8.17 5.35 0 8.063 2.745 8.063 8.17v5.576c0 .325.1.64.296.904.954 1.29.546 3.013-.408 3.75a1.52 1.52 0 0 0-.54.825c-.64 2.505-1.696 4.634-3.048 6.155-.24.27-.384.637-.384 1.003v2.484c0 .14.02.273.058.405.5 1.755 2.877 4.34 16.78 10.23.02.01.103.1.103.265v6.235h-.01z"/></g></svg>
\ No newline at end of file