From 8d8b9044392bb31df3bf7b8bc6f9d684903f4cef Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Wed, 28 Aug 2019 15:36:43 +0000
Subject: [PATCH] Bug 1542529 - Fix and unify delete icons. r=jaws

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

--HG--
extra : moz-landing-system : lando
---
 .../aboutlogins/content/components/login-item.css           | 2 +-
 browser/components/aboutlogins/content/icons/delete.svg     | 6 ------
 browser/components/aboutlogins/jar.mn                       | 1 -
 toolkit/themes/shared/icons/delete.svg                      | 5 +++--
 4 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 browser/components/aboutlogins/content/icons/delete.svg

diff --git a/browser/components/aboutlogins/content/components/login-item.css b/browser/components/aboutlogins/content/components/login-item.css
index 642f82b80636..5a64f7f12cca 100644
--- a/browser/components/aboutlogins/content/components/login-item.css
+++ b/browser/components/aboutlogins/content/components/login-item.css
@@ -78,7 +78,7 @@ input[type="url"][readOnly] {
 }
 
 .delete-button {
-  background-image: url("chrome://browser/content/aboutlogins/icons/delete.svg");
+  background-image: url("chrome://global/skin/icons/delete.svg");
   padding-inline-start: 30px; /* 8px on each side, and 14px for icon width */
 }
 
diff --git a/browser/components/aboutlogins/content/icons/delete.svg b/browser/components/aboutlogins/content/icons/delete.svg
deleted file mode 100644
index b2c3ec2493ec..000000000000
--- a/browser/components/aboutlogins/content/icons/delete.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="14" height="16" viewBox="0 0 14 16" fill="context-fill">
-  <path d="M6,12.0025063 C6.27614237,12.0025063 6.5,11.7786487 6.5,11.5025063 L6.5,5.50250628 C6.5,5.22636391 6.27614237,5.00250628 6,5.00250628 C5.72385763,5.00250628 5.5,5.22636391 5.5,5.50250628 L5.5,11.5025063 C5.5,11.7786487 5.72385763,12.0025063 6,12.0025063 Z M8,12.0025063 C8.27614237,12.0025063 8.5,11.7786487 8.5,11.5025063 L8.5,5.50250628 C8.5,5.22636391 8.27614237,5.00250628 8,5.00250628 C7.72385763,5.00250628 7.5,5.22636391 7.5,5.50250628 L7.5,11.5025063 C7.5,11.7786487 7.72385763,12.0025063 8,12.0025063 Z M10,12.0025063 C10.2761424,12.0025063 10.5,11.7786487 10.5,11.5025063 L10.5,5.50250628 C10.5,5.22636391 10.2761424,5.00250628 10,5.00250628 C9.72385763,5.00250628 9.5,5.22636391 9.5,5.50250628 L9.5,11.5025063 C9.5,11.7786487 9.72385763,12.0025063 10,12.0025063 Z M13.5,2.00250628 L10.45,2.00250628 C10.2134038,0.837344292 9.18894081,-1.91253263e-16 8,0 C6.81105919,1.91253263e-16 5.78659623,0.837344292 5.55,2.00250628 L2.5,2.00250628 C1.94771525,2.00250628 1.5,2.45022153 1.5,3.00250628 C1.5,3.55479103 1.94771525,4.00250628 2.5,4.00250628 L2.5,13.0025063 C2.5,14.6593605 3.84314575,16.0025063 5.5,16.0025063 L10.5,16.0025063 C12.1568542,16.0025063 13.5,14.6593605 13.5,13.0025063 L13.5,4.00250628 C14.0522847,4.00250628 14.5,3.55479103 14.5,3.00250628 C14.5,2.45022153 14.0522847,2.00250628 13.5,2.00250628 L13.5,2.00250628 Z M8,1.00250628 C8.62819604,1.00902136 9.18471788,1.40910895 9.391,2.00250628 L6.609,2.00250628 C6.81528212,1.40910895 7.37180396,1.00902136 8,1.00250628 Z M11.5,13.0025063 C11.5,13.554791 11.0522847,14.0025063 10.5,14.0025063 L5.5,14.0025063 C4.94771525,14.0025063 4.5,13.554791 4.5,13.0025063 L4.5,4.00250628 L11.5,4.00250628 L11.5,13.0025063 Z"/>
-</svg>
diff --git a/browser/components/aboutlogins/jar.mn b/browser/components/aboutlogins/jar.mn
index 770a4f495099..0eb9ced3d126 100644
--- a/browser/components/aboutlogins/jar.mn
+++ b/browser/components/aboutlogins/jar.mn
@@ -22,7 +22,6 @@ browser.jar:
   content/browser/aboutlogins/components/login-list-item.js    (content/components/login-list-item.js)
   content/browser/aboutlogins/components/menu-button.css       (content/components/menu-button.css)
   content/browser/aboutlogins/components/menu-button.js        (content/components/menu-button.js)
-  content/browser/aboutlogins/icons/delete.svg        (content/icons/delete.svg)
   content/browser/aboutlogins/icons/edit.svg          (content/icons/edit.svg)
   content/browser/aboutlogins/icons/favicon.svg       (content/icons/favicon.svg)
   content/browser/aboutlogins/icons/hide-password.svg (content/icons/hide-password.svg)
diff --git a/toolkit/themes/shared/icons/delete.svg b/toolkit/themes/shared/icons/delete.svg
index 1575bb2d9211..6740822218cf 100644
--- a/toolkit/themes/shared/icons/delete.svg
+++ b/toolkit/themes/shared/icons/delete.svg
@@ -1,6 +1,7 @@
 <!-- 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="24" height="24">
-  <path fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity" d="M20 5h-5a3 3 0 1 0-6 0H4a1 1 0 0 0 0 2h1v12a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3V7h1a1 1 0 1 0 0-2zm-8-2a2 2 0 0 1 2 2h-4a2 2 0 0 1 2-2zM7 7v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V7H7zm2.539 2.002a.5.5 0 0 0-.503.498l-.034 8a.5.5 0 0 0 1 .004l.034-8a.5.5 0 0 0-.497-.502zm4.497.498a.5.5 0 0 1 1 .004l-.034 8a.5.5 0 0 1-1-.004l.034-8zM12 9.002a.5.5 0 0 0-.502.498l-.034 8a.5.5 0 0 0 1 .004l.034-8A.5.5 0 0 0 12 9.002z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M6.5 12a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5zm2 0a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5zm2 0a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5z"/>
+  <path d="M14 2h-3.05a2.5 2.5 0 0 0-4.9 0H3a1 1 0 0 0 0 2v9a3 3 0 0 0 3 3h5a3 3 0 0 0 3-3V4a1 1 0 0 0 0-2zM8.5 1a1.489 1.489 0 0 1 1.391 1H7.109A1.489 1.489 0 0 1 8.5 1zM12 13a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V4h7z"/>
 </svg>