Bug 1707690 - Remove the places folder icon in favor of the toolkit shared icon.r=harry,desktop-theme-reviewers
authorSam Foster <sfoster@mozilla.com>
Fri, 11 Jun 2021 23:35:08 +0000
changeset 582913 2a380d0e581b34fcd314511a7706ea224bcc2930
parent 582912 20ab2670b9f66f26a95664f44dcbe1d01a6c3a77
child 582914 b9cc2b752dc3eb0d6a854251009e603a5adadcab
push id144853
push usersfoster@mozilla.com
push dateFri, 11 Jun 2021 23:45:51 +0000
treeherderautoland@2a380d0e581b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersharry, desktop-theme-reviewers
bugs1707690
milestone91.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1707690 - Remove the places folder icon in favor of the toolkit shared icon.r=harry,desktop-theme-reviewers Differential Revision: https://phabricator.services.mozilla.com/D117483
browser/installer/allowed-dupes.mn
browser/themes/linux/places/editBookmark.css
browser/themes/osx/places/editBookmark.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/places/folder.svg
browser/themes/shared/places/tree-icons.css
browser/themes/shared/toolbarbutton-icons.inc.css
browser/themes/windows/places/editBookmark.css
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -110,20 +110,16 @@ browser/chrome/browser/skin/classic/brow
 # Bug 1704669 - Deduplicate checkmark icons in the tree
 chrome/toolkit/skin/classic/global/icons/success.svg
 chrome/toolkit/skin/classic/global/icons/check.svg
 
 # Bug 1706206 - De-duplicate storage icons
 browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
 browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
 
-# Bug 1707690 - De-duplicate folder icons
-browser/chrome/browser/skin/classic/browser/places/folder.svg
-chrome/toolkit/skin/classic/global/icons/folder.svg
-
 # Bug 1707101 - De-duplicate Protections Panel icons
 browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image.svg
 browser/chrome/browser/skin/classic/browser/notification-icons/canvas.svg
 browser/chrome/browser/skin/classic/browser/controlcenter/tracker-image-disabled.svg
 browser/chrome/browser/skin/classic/browser/notification-icons/canvas-blocked.svg
 browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters.svg
 browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
 
--- a/browser/themes/linux/places/editBookmark.css
+++ b/browser/themes/linux/places/editBookmark.css
@@ -9,17 +9,17 @@
   height: 16px;
 }
 
 .folder-icon > .menu-iconic-left {
   display: -moz-box;
 }
 
 .folder-icon {
-  list-style-image: url("chrome://browser/skin/places/folder.svg") !important;
+  list-style-image: url("chrome://global/skin/icons/folder.svg") !important;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #editBMPanel_folderTree {
   margin-block: 2px;
 }
 
--- a/browser/themes/osx/places/editBookmark.css
+++ b/browser/themes/osx/places/editBookmark.css
@@ -9,17 +9,17 @@
   height: 16px;
 }
 
 .folder-icon > .menu-iconic-left {
   display: -moz-box;
 }
 
 .folder-icon {
-  list-style-image: url("chrome://browser/skin/places/folder.svg") !important;
+  list-style-image: url("chrome://global/skin/icons/folder.svg") !important;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #editBMPanel_folderTree {
   margin: 6px 4px 0;
 }
 
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -239,15 +239,14 @@
   skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header@2x.png               (../shared/panic-panel/header@2x.png)
   skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
   skin/classic/browser/panic-panel/icons@2x.png                (../shared/panic-panel/icons@2x.png)
   skin/classic/browser/places/bookmarksMenu.svg                (../shared/places/bookmarksMenu.svg)
   skin/classic/browser/places/bookmarksToolbar.svg             (../shared/places/bookmarksToolbar.svg)
-  skin/classic/browser/places/folder.svg                       (../shared/places/folder.svg)
   skin/classic/browser/places/folder-smart.svg                 (../shared/places/folder-smart.svg)
   skin/classic/browser/places/history.svg                      (../shared/places/history.svg)
   skin/classic/browser/places/tag.svg                          (../shared/places/tag.svg)
   skin/classic/browser/places/tree-icons.css                   (../shared/places/tree-icons.css)
   skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css (../shared/privatebrowsing/aboutPrivateBrowsing.css)
   skin/classic/browser/privatebrowsing/favicon.svg             (../shared/privatebrowsing/favicon.svg)
deleted file mode 100644
--- a/browser/themes/shared/places/folder.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" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="m13.995 14-10.99 0A2.007 2.007 0 0 1 1 11.995l0-8.99C1 1.899 1.899 1 3.005 1l2.958 0a2.01 2.01 0 0 1 1.47.641L8.693 3l5.302 0C15.101 3 16 3.899 16 5.005l0 6.99A2.007 2.007 0 0 1 13.995 14zM2.85 2.25l-.6.6 0 9.3.6.6 11.3 0 .6-.6 0-7.3-.6-.6-5.73 0-.458-.2-1.445-1.559a.758.758 0 0 0-.554-.241l-3.113 0z"/>
-</svg>
--- a/browser/themes/shared/places/tree-icons.css
+++ b/browser/themes/shared/places/tree-icons.css
@@ -12,17 +12,17 @@ treechildren::-moz-tree-image(title) {
   padding-inline-end: 2px;
   margin: 0 2px;
   width: 16px;
   height: 16px;
 }
 
 treechildren::-moz-tree-image(title, container),
 treechildren::-moz-tree-image(title, open) {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
 }
 
 treechildren::-moz-tree-image(title, separator) {
   list-style-image: none;
   width: 0 !important;
   height: 0 !important;
   margin: 0;
 }
@@ -54,27 +54,27 @@ treechildren::-moz-tree-image(query, Org
 }
 
 /* calendar icon for folders grouping items by date */
 treechildren::-moz-tree-image(title, query, dayContainer) {
   list-style-image: url("chrome://browser/skin/places/history.svg");
 }
 
 treechildren::-moz-tree-image(title, query, hostContainer) {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
 }
 
 treechildren::-moz-tree-image(query, OrganizerQuery_history____v) {
   list-style-image: url("chrome://browser/skin/places/history.svg");
 }
 
 /* We want some queries to look like ordinary folders. This must come
    after the (title, query) selector, or it would get overridden. */
 treechildren::-moz-tree-image(title, query, folder) {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
 }
 
 treechildren::-moz-tree-cell-text(title, separator) {
   color: ThreeDShadow;
   margin: 0 5px;
 }
 
 treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -451,17 +451,17 @@ toolbar[brighttext] #panic-button[open] 
 
 toolbarbutton.bookmark-item {
   -moz-context-properties: fill, fill-opacity;
   fill: var(--toolbarbutton-icon-fill);
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 .bookmark-item[container] {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
 }
 
 .bookmark-item[container][query] {
   list-style-image: url("chrome://browser/skin/places/folder-smart.svg");
 }
 
 .bookmark-item[query][tagContainer] {
   list-style-image: url("chrome://browser/skin/places/tag.svg");
@@ -469,17 +469,17 @@ toolbarbutton.bookmark-item {
 }
 
 .bookmark-item[query][dayContainer] {
   list-style-image: url("chrome://browser/skin/places/history.svg");
   -moz-image-region: auto;
 }
 
 .bookmark-item[query][hostContainer] {
-  list-style-image: url("chrome://browser/skin/places/folder.svg");
+  list-style-image: url("chrome://global/skin/icons/folder.svg");
 }
 
 #whats-new-menu-button {
   list-style-image: url("chrome://browser/skin/whatsnew.svg");
 }
 
 #ion-button {
   list-style-image: url("chrome://browser/skin/ion.svg");
--- a/browser/themes/windows/places/editBookmark.css
+++ b/browser/themes/windows/places/editBookmark.css
@@ -9,17 +9,17 @@
   height: 16px;
 }
 
 .folder-icon > .menu-iconic-left {
   display: -moz-box;
 }
 
 .folder-icon {
-  list-style-image: url("chrome://browser/skin/places/folder.svg") !important;
+  list-style-image: url("chrome://global/skin/icons/folder.svg") !important;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #editBMPanel_folderTree {
   margin-block: 2px;
 }