From 280105bc8e55ca03d2bbed1e720bbf39feb04111 Mon Sep 17 00:00:00 2001
From: Sam Foster <sfoster@mozilla.com>
Date: Tue, 19 Mar 2019 16:46:35 +0000
Subject: [PATCH] Bug 1534447 - Replace login and login-detailed icon with new
 icon. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D23749

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/autocomplete.inc.css                 | 2 +-
 browser/themes/shared/icons/login.svg                      | 6 ++++++
 browser/themes/shared/jar.inc.mn                           | 3 +--
 browser/themes/shared/notification-icons.inc.css           | 7 ++-----
 .../themes/shared/notification-icons/login-detailed.svg    | 7 -------
 browser/themes/shared/notification-icons/login.svg         | 6 ------
 6 files changed, 10 insertions(+), 21 deletions(-)
 create mode 100644 browser/themes/shared/icons/login.svg
 delete mode 100644 browser/themes/shared/notification-icons/login-detailed.svg
 delete mode 100644 browser/themes/shared/notification-icons/login.svg

diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css
index 3042b615036f..4055cb0afe2f 100644
--- a/browser/themes/shared/autocomplete.inc.css
+++ b/browser/themes/shared/autocomplete.inc.css
@@ -42,7 +42,7 @@
 /* Login form autocompletion */
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon {
   display: initial;
-  list-style-image: url(chrome://browser/skin/notification-icons/login.svg);
+  list-style-image: url(chrome://browser/skin/login.svg);
   -moz-context-properties: fill;
   fill: GrayText;
 }
diff --git a/browser/themes/shared/icons/login.svg b/browser/themes/shared/icons/login.svg
new file mode 100644
index 000000000000..f0c70cb3ff46
--- /dev/null
+++ b/browser/themes/shared/icons/login.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M12 4a4 4 0 0 0-3.86 3H1a1 1 0 0 0 0 2v1a1 1 0 0 0 2 0V9h1v1a1 1 0 0 0 2 0V9h2.14A4 4 0 1 0 12 4zm0 6a2 2 0 1 1 2-2 2 2 0 0 1-2 2z"/>
+</svg>
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index d8856b4a7443..a703e5505d9e 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -78,8 +78,6 @@
   skin/classic/browser/notification-icons/desktop-notification.svg          (../shared/notification-icons/desktop-notification.svg)
   skin/classic/browser/notification-icons/focus-tab-by-prompt.svg           (../shared/notification-icons/focus-tab-by-prompt.svg)
   skin/classic/browser/notification-icons/indexedDB.svg                     (../shared/notification-icons/indexedDB.svg)
-  skin/classic/browser/notification-icons/login-detailed.svg                (../shared/notification-icons/login-detailed.svg)
-  skin/classic/browser/notification-icons/login.svg                         (../shared/notification-icons/login.svg)
   skin/classic/browser/notification-icons/microphone-blocked.svg            (../shared/notification-icons/microphone-blocked.svg)
   skin/classic/browser/notification-icons/microphone-detailed.svg           (../shared/notification-icons/microphone-detailed.svg)
   skin/classic/browser/notification-icons/microphone.svg                    (../shared/notification-icons/microphone.svg)
@@ -176,6 +174,7 @@
   skin/classic/browser/library-bookmark-animation.svg (../shared/icons/library-bookmark-animation.svg)
   skin/classic/browser/library-pocket-animation.svg   (../shared/icons/library-pocket-animation.svg)
   skin/classic/browser/link.svg                       (../shared/icons/link.svg)
+  skin/classic/browser/login.svg                      (../shared/icons/login.svg)
   skin/classic/browser/mail.svg                       (../shared/icons/mail.svg)
   skin/classic/browser/menu.svg                       (../shared/icons/menu.svg)
   skin/classic/browser/menu-badged.svg                (../shared/icons/menu-badged.svg)
diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
index 9b634c1258f6..eb553f7ffe5e 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -113,12 +113,9 @@
   list-style-image: url(chrome://browser/skin/notification-icons/indexedDB.svg);
 }
 
+.popup-notification-icon[popupid="password"],
 .login-icon {
-  list-style-image: url(chrome://browser/skin/notification-icons/login.svg);
-}
-
-.popup-notification-icon[popupid="password"] {
-  list-style-image: url(chrome://browser/skin/notification-icons/login-detailed.svg);
+  list-style-image: url(chrome://browser/skin/login.svg);
 }
 
 .camera-icon {
diff --git a/browser/themes/shared/notification-icons/login-detailed.svg b/browser/themes/shared/notification-icons/login-detailed.svg
deleted file mode 100644
index abb89d5f9fbe..000000000000
--- a/browser/themes/shared/notification-icons/login-detailed.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
-     width="32" height="32" viewBox="0 0 32 32">
-  <path d="m 1,27 0,3.5 a 0.5,0.5 0 0 0 0.5,0.5 l 5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1.5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-2 2,0 2.5,-2.5 q 0.5,-0.5 1,0 l 1,1 c 0.5,0.5 1,0.5 1.5,-0.5 l 1,-2 a 9,9 0 1 0 -8,-8 l -2,1 c -1,0.5 -1,1 -0.5,1.5 l 1.5,1.5 q 0.5,0.5 0,1 z m 21,-19.1 a 2,2 0 1 1 0,0.2 z"/>
-</svg>
diff --git a/browser/themes/shared/notification-icons/login.svg b/browser/themes/shared/notification-icons/login.svg
deleted file mode 100644
index f6bebfa69c77..000000000000
--- a/browser/themes/shared/notification-icons/login.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M10.992 1a4.009 4.009 0 0 0-4.009 4.008c0 .1.022.187.028.282-.059.05-.119.087-.178.143L5.667 6.6a.366.366 0 0 0 0 .467A1.878 1.878 0 0 0 6 7.5.353.353 0 0 1 6 8l-5 5v1.767a.229.229 0 0 0 .233.233H3.77a.229.229 0 0 0 .23-.233v-.778h.75a.227.227 0 0 0 .233-.228v-.768H5.2s.28 0 .28-.235V12.5h.779s.233-.1.233-.244v-1.271h.855l1.12-1.118H8.7l.467.467c.233.233.233.233.365.233a.437.437 0 0 0 .275-.127l.993-1.273c.034-.053.054-.107.084-.161.036 0 .07.011.107.011a4.008 4.008 0 1 0 0-8.017zM12.5 4.489a1 1 0 1 1 1-1 1 1 0 0 1-1 1z"/>
-</svg>