Bug 1636775 - Fix feed folder/item icon regression, r=Paenglab
authoralta88@fixall.com
Sun, 10 May 2020 12:03:45 -0600
changeset 39113 7ff3e6dcd86f52b4bef4dd5930ab20e426a57f86
parent 39112 8ad4fbfb3c8dbaf090c2a8c559cb9e9cbf117f06
child 39114 fa260ff0b744586f575fa2d53e317bd6d037da18
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersPaenglab
bugs1636775
Bug 1636775 - Fix feed folder/item icon regression, r=Paenglab
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/accountCentral.css
mail/themes/shared/mail/folderMenus.css
mail/themes/shared/mail/folderPane.css
mail/themes/shared/mail/icons/feeds.svg
mail/themes/shared/mail/icons/subscribe.svg
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -58,16 +58,17 @@
   skin/classic/messenger/icons/contact.svg                    (../shared/mail/icons/contact.svg)
   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/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)
@@ -149,17 +150,16 @@
   skin/classic/messenger/icons/smiley.svg                     (../shared/mail/icons/smiley.svg)
   skin/classic/messenger/icons/sort.svg                       (../shared/mail/icons/sort.svg)
   skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.svg)
   skin/classic/messenger/icons/spring.svg                     (../shared/mail/icons/spring.svg)
   skin/classic/messenger/icons/star.svg                       (../shared/mail/icons/star.svg)
   skin/classic/messenger/icons/starred.svg                    (../shared/mail/icons/starred.svg)
   skin/classic/messenger/icons/sticky.svg                     (../shared/mail/icons/sticky.svg)
   skin/classic/messenger/icons/stop.svg                       (../shared/mail/icons/stop.svg)
-  skin/classic/messenger/icons/subscribe.svg                  (../shared/mail/icons/subscribe.svg)
   skin/classic/messenger/icons/subthread-ignored.svg          (../shared/mail/icons/subthread-ignored.svg)
   skin/classic/messenger/icons/tab-drag-indicator.svg         (../shared/mail/icons/tab-drag-indicator.svg)
   skin/classic/messenger/icons/table.svg                      (../shared/mail/icons/table.svg)
   skin/classic/messenger/icons/tag.svg                        (../shared/mail/icons/tag.svg)
   skin/classic/messenger/icons/template.svg                   (../shared/mail/icons/template.svg)
   skin/classic/messenger/icons/thread.svg                     (../shared/mail/icons/thread.svg)
   skin/classic/messenger/icons/thread-col.svg                 (../shared/mail/icons/thread-col.svg)
   skin/classic/messenger/icons/thread-ignored.svg             (../shared/mail/icons/thread-ignored.svg)
--- a/mail/themes/shared/mail/accountCentral.css
+++ b/mail/themes/shared/mail/accountCentral.css
@@ -102,17 +102,17 @@ body {
 #accountLogo[type="none"] {
   background-image: url("chrome://messenger/skin/icons/folder.svg");
 }
 
 #accountLogo[type="rss"],
 #setupFeeds::before,
 #rssSubscriptionButton:before,
 #nntpSubscriptionButton:before {
-  background-image: url("chrome://messenger/skin/icons/subscribe.svg");
+  background-image: url("chrome://messenger/skin/icons/feeds.svg");
 }
 
 #accountLogo[type="nntp"] {
   background-image: url("chrome://messenger/skin/icons/reader-mode.svg");
 }
 
 .account-central-header {
   display: flex;
--- a/mail/themes/shared/mail/folderMenus.css
+++ b/mail/themes/shared/mail/folderMenus.css
@@ -24,17 +24,17 @@ menulist.folderMenuItem::part(icon) {
 
 /* Newsgroup */
 .folderMenuItem[ServerType="nntp"] {
   list-style-image: url("chrome://messenger/skin/icons/newsgroup.svg");
 }
 
 /* Feed folder */
 .folderMenuItem[IsFeedFolder="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
+  list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
 }
 
 /* Special folders */
 
 .folderMenuItem[SpecialFolder="Inbox"] {
   list-style-image: url("chrome://messenger/skin/icons/inbox.svg");
 }
 
@@ -94,10 +94,10 @@ menulist.folderMenuItem::part(icon) {
 
 /** Secure news server */
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
   list-style-image: url("chrome://messenger/skin/icons/globe-secure.svg");
 }
 
 /* Feed server */
 .folderMenuItem[IsServer="true"][ServerType="rss"] {
-  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
+  list-style-image: url("chrome://messenger/skin/icons/feeds.svg");
 }
--- a/mail/themes/shared/mail/folderPane.css
+++ b/mail/themes/shared/mail/folderPane.css
@@ -108,24 +108,31 @@ treechildren::-moz-tree-image(folderName
 
 /* ..... Mail server  ..... */
 .tabmail-tab[type="folder"][IsServer="true"],
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/message.svg");
   fill: var(--primary);
 }
 
-/* ..... Feed folder, feed item ..... */
-treechildren::-moz-tree-image(folderNameCol, isFeed-true),
+/* ..... Feed server/account ..... */
 .tabmail-tab[type="folder"][IsServer="true"][ServerType="rss"],
-treechildren::-moz-tree-image(folderNameCol, 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"],
 treechildren::-moz-tree-image(folderNameCol, isFeedFolder-true) {
-  list-style-image: url("chrome://messenger/skin/icons/subscribe.svg");
-  fill: var(--primary);
+  list-style-image: url("chrome://messenger/skin/icons/feeds.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),
 treechildren::-moz-tree-cell-text(folderNameCol, serverIsPaused),
 treechildren::-moz-tree-image(folderNameCol, isPaused),
 treechildren::-moz-tree-cell-text(folderNameCol, isPaused) {
   opacity: 0.4;
 }
rename from mail/themes/shared/mail/icons/subscribe.svg
rename to mail/themes/shared/mail/icons/feeds.svg