Bug 1636775 - Add a feed folder icon for trees, r=Paenglab
authoralta88@fixall.com
Sun, 10 May 2020 13:48:04 -0600
changeset 39114 fa260ff0b744586f575fa2d53e317bd6d037da18
parent 39113 7ff3e6dcd86f52b4bef4dd5930ab20e426a57f86
child 39115 f82b65b87ebe2f1b8458d59c4043cbba6601c65d
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersPaenglab
bugs1636775
Bug 1636775 - Add a feed folder icon for trees, r=Paenglab
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/folderPane.css
mail/themes/shared/mail/icons/feeds-folder.svg
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -59,16 +59,17 @@
   skin/classic/messenger/icons/conversation.svg               (../shared/mail/icons/conversation.svg)
   skin/classic/messenger/icons/decrease.svg                   (../shared/mail/icons/decrease.svg)
   skin/classic/messenger/icons/delete.svg                     (../shared/mail/icons/delete.svg)
   skin/classic/messenger/icons/delete-col.svg                 (../shared/mail/icons/delete-col.svg)
   skin/classic/messenger/icons/developer.svg                  (../shared/mail/icons/developer.svg)
   skin/classic/messenger/icons/exclude.svg                    (../shared/mail/icons/exclude.svg)
   skin/classic/messenger/icons/encryption-key.svg             (../shared/mail/icons/encryption-key.svg)
   skin/classic/messenger/icons/feeds.svg                      (../shared/mail/icons/feeds.svg)
+  skin/classic/messenger/icons/feeds-folder.svg               (../shared/mail/icons/feeds-folder.svg)
   skin/classic/messenger/icons/file.svg                       (../shared/mail/icons/file.svg)
   skin/classic/messenger/icons/file-item.svg                  (../shared/mail/icons/file-item.svg)
   skin/classic/messenger/icons/filter.svg                     (../shared/mail/icons/filter.svg)
   skin/classic/messenger/icons/flag-col.svg                   (../shared/mail/icons/flag-col.svg)
   skin/classic/messenger/icons/flagged.svg                    (../shared/mail/icons/flagged.svg)
   skin/classic/messenger/icons/folder.svg                     (../shared/mail/icons/folder.svg)
   skin/classic/messenger/icons/folder-local.svg               (../shared/mail/icons/folder-local.svg)
   skin/classic/messenger/icons/forward.svg                    (../shared/mail/icons/forward.svg)
--- a/mail/themes/shared/mail/folderPane.css
+++ b/mail/themes/shared/mail/folderPane.css
@@ -115,19 +115,22 @@ treechildren::-moz-tree-image(folderName
 
 /* ..... Feed server/account ..... */
 .tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
   list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
   fill: var(--primary);
 }
 /* ..... Feed folder ..... */
-.tabmail-tab[type="folder"][IsFeedFolder="true"],
+.tabmail-tab[type="folder"][IsFeedFolder="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
+}
+/* ..... Feed folder - trees ..... */
 treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-  list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
+  list-style-image: url("chrome://messenger/skin/icons/feeds-folder.svg");
 }
 /* ..... Feed subscription item ..... */
 treechildren::-moz-tree-image(folderNameCol, isFeed-true) {
   list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
   fill: orange;
 }
 
 treechildren::-moz-tree-image(folderNameCol, serverIsPaused),
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/feeds-folder.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" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M2 1a2 2 0 00-2 2v10c0 1.1.9 2 2 2h12a2 2 0 002-2V5a2 2 0 00-2-2H8.15L6.58 1.54A2 2 0 005.22 1H2zm0 2h3.22L6.3 4H2V3zm6 1.99l.15.01H14v8H2V5h6v-.01zM5 5.5a.5.5 0 000 1 5.44 5.44 0 015.5 5.5.5.5 0 001 0A6.43 6.43 0 005 5.5zm0 2a.5.5 0 000 1A3.46 3.46 0 018.5 12a.5.5 0 001 0A4.45 4.45 0 005 7.5zm.75 2.5A1.25 1.25 0 107 11.25 1.25 1.25 0 005.75 10z"/>
+</svg>