Bug 1406670 - Use SVG icons for the QFB bar. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 07 Oct 2017 20:53:50 +0200
changeset 29124 48a4c3f584cc13bef1fc1c405c7edb312dc7995e
parent 29123 3d4d669c055763b5a4f8973084cc881c88c08beb
child 29125 ba6ce4267a6cfafb11338018144494f3432cff84
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1406670
Bug 1406670 - Use SVG icons for the QFB bar. r=jorgk
calendar/base/themes/common/icons/attach.svg
mail/themes/linux/jar.mn
mail/themes/linux/mail/icons/black_pin.png
mail/themes/linux/mail/icons/filterbar.png
mail/themes/linux/mail/icons/red_pin.png
mail/themes/linux/mail/quickFilterBar.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/icons/QFB-toolbar.png
mail/themes/osx/mail/icons/QFB-toolbar@2x.png
mail/themes/osx/mail/quickFilterBar.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/attach.svg
mail/themes/shared/mail/icons/star.svg
mail/themes/shared/mail/icons/sticky.svg
mail/themes/windows/jar.mn
mail/themes/windows/mail/icons/quick-search-icons.png
mail/themes/windows/mail/quickFilterBar.css
--- a/calendar/base/themes/common/icons/attach.svg
+++ b/calendar/base/themes/common/icons/attach.svg
@@ -1,6 +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="M12 12V3.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5V12zM7 4.5V11H6V4.5c0-.28.22-.5.5-.5s.5.22.5.5zM4 3c0-1.66 1.34-3 3-3s3 1.34 3 3v8H9V4H5v8H4zm3 8c0 .55.45 1 1 1s1-.45 1-1h1c0 1.1-.9 2-2 2s-2-.9-2-2zm-2 1c0 1.66 1.34 3 3 3s3-1.34 3-3h1c0 2.2-1.8 4-4 4s-4-1.8-4-4zm0-9v1h4V3zm4 0c0-1.1-.9-2-2-2s-2 .9-2 2z"/>
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M12 12V3.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5V12zM7 4.5V11H6V4.5c0-.28.22-.5.5-.5s.5.22.5.5zM4 3c0-1.66 1.34-3 3-3s3 1.34 3 3v8H9V4H5v8H4zm3 8c0 .55.45 1 1 1s1-.45 1-1h1c0 1.1-.9 2-2 2s-2-.9-2-2zm-2 1c0 1.66 1.34 3 3 3s3-1.34 3-3h1c0 2.2-1.8 4-4 4s-4-1.8-4-4zm0-9v1h4V3zm4 0c0-1.1-.9-2-2-2s-2 .9-2 2z"/>
 </svg>
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -162,20 +162,17 @@ classic.jar:
   skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
-  skin/classic/messenger/icons/black_pin.png                  (mail/icons/black_pin.png)
   skin/classic/messenger/icons/dropmarker.svg                 (mail/icons/dropmarker.svg)
-  skin/classic/messenger/icons/filterbar.png                  (mail/icons/filterbar.png)
-  skin/classic/messenger/icons/red_pin.png                    (mail/icons/red_pin.png)
   skin/classic/messenger/icons/dragIndicator.png              (mail/icons/dragIndicator.png)
   skin/classic/messenger/icons/status.png                     (mail/icons/status.png)
   skin/classic/messenger/icons/status-small.png               (mail/icons/status-small.png)
   skin/classic/messenger/accountcentral/read-messages.png     (mail/accountcentral/read-messages.png)
   skin/classic/messenger/accountcentral/write-message.png     (mail/accountcentral/write-message.png)
   skin/classic/messenger/accountcentral/create-account.png    (mail/accountcentral/create-account.png)
   skin/classic/messenger/accountcentral/account-settings.png  (mail/accountcentral/account-settings.png)
   skin/classic/messenger/accountcentral/search-messages.png   (mail/accountcentral/search-messages.png)
deleted file mode 100644
index e7051bc25668dc31ffc475549c5c31ff6455be77..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2168f3d9c4a01ec427c1a6a7523aa0a6263520ff..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8f06471545ca860cf8da01cf0d2226740ee48f93..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/linux/mail/quickFilterBar.css
+++ b/mail/themes/linux/mail/quickFilterBar.css
@@ -33,73 +33,69 @@
 }
 
 #threadTree[filterActive="nomatches"] {
   outline: 1px solid #cc0000;
 }
 
 /* :::: Filter Buttons :::: */
 
+#quick-filter-bar toolbarbutton {
+  margin-right: 1px;
+  margin-left: 1px;
+}
+
+#quick-filter-bar-main-bar toolbarbutton {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+}
+
 #quick-filter-bar #qfb-sticky,
 #quick-filter-bar #qfb-sticky[checked] {
   background: none;
   border-width: 0;
   border-image: none;
 }
 
 #qfb-sticky {
-  list-style-image: url("chrome://messenger/skin/icons/black_pin.png");
+  list-style-image: url("chrome://messenger/skin/icons/sticky.svg");
 }
 
 #qfb-sticky[checked] {
-  list-style-image: url("chrome://messenger/skin/icons/red_pin.png");
+  fill: #b20606;
 }
 
 /* we use both IDs so we are more precise than the other # toolbarbutton rules */
 #quick-filter-bar #qfb-sticky:hover {
   text-shadow: none;
   background: none;
   border: 1px solid transparent;
   border-radius: 0;
   border-width: 0;
 }
 
-#qfb-closebutton {
-  list-style-image: url("chrome://global/skin/icons/closeSidebar.png");
-  -moz-image-region: rect(0px, 14px, 14px, 0px);
-}
-
 #qfb-unread {
-  list-style-image: url("chrome://messenger/skin/icons/filterbar.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
 }
 
 #qfb-starred {
-  list-style-image: url("chrome://messenger/skin/icons/filterbar.png");
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-.qfb-starred-nostar {
-  list-style-image: url("chrome://messenger/skin/starContact.png");
-  -moz-image-region:rect(0px 32px 16px 16px);
+  list-style-image: url("chrome://messenger/skin/icons/star.svg");
 }
 
 #qfb-inaddrbook {
-  list-style-image: url("chrome://messenger/skin/icons/filterbar.png");
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  list-style-image: url("chrome://messenger/skin/icons/address.svg")
 }
 
 #qfb-tags {
-  list-style-image: url("chrome://messenger/skin/icons/filterbar.png");
-  -moz-image-region: rect(0px, 64px, 16px, 48px);
+  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
 }
 
 #qfb-attachment {
-  list-style-image: url("chrome://messenger/skin/icons/filterbar.png");
-  -moz-image-region: rect(0px, 80px, 16px, 64px);
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
 }
 
 #qfb-results-label {
   color: GrayText;
 }
 
 #quick-filter-bar[filterActive="matches"] #qfb-results-label {
   color: #4e9a06;
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -200,18 +200,16 @@ classic.jar:
   skin/classic/messenger/icons/offline.png                       (mail/icons/offline.png)
   skin/classic/messenger/icons/offline@2x.png                    (mail/icons/offline@2x.png)
   skin/classic/messenger/icons/arrow-dn-7.png                    (mail/icons/arrow-dn-7.png)
   skin/classic/messenger/icons/zoomout.png                       (mail/icons/zoomout.png)
   skin/classic/messenger/icons/zoomout-hover.png                 (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/timeline.png                      (mail/icons/timeline.png)
   skin/classic/messenger/icons/timeline-inverted.png             (mail/icons/timeline-inverted.png)
   skin/classic/messenger/icons/empty-search-results.png          (mail/icons/empty-search-results.png)
-  skin/classic/messenger/icons/QFB-toolbar.png                   (mail/icons/QFB-toolbar.png)
-  skin/classic/messenger/icons/QFB-toolbar@2x.png                (mail/icons/QFB-toolbar@2x.png)
   skin/classic/messenger/icons/status.png                        (mail/icons/status.png)
   skin/classic/messenger/icons/status@2x.png                     (mail/icons/status@2x.png)
   skin/classic/messenger/icons/status-small.png                  (mail/icons/status-small.png)
   skin/classic/messenger/icons/status-small@2x.png               (mail/icons/status-small@2x.png)
   skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
   skin/classic/messenger/icons/notloading.png                    (mail/icons/notloading.png)
   skin/classic/messenger/icons/notloading@2x.png                 (mail/icons/notloading@2x.png)
   skin/classic/messenger/icons/junk.png                          (mail/icons/junk.png)
deleted file mode 100644
index c3397ba3304133613f6eea008a12e2f80d445d6a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0f67a475ca721cba15a273c2002195e24d0ffac6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/mail/quickFilterBar.css
+++ b/mail/themes/osx/mail/quickFilterBar.css
@@ -51,29 +51,28 @@
   color: #888;
   font-weight: bold;
 }
 
 /* :::: Filter Buttons :::: */
 
 #quick-filter-bar toolbarbutton {
   color: #444;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
   height: 16px;
   font-weight: bold;
   padding: 0 4px;
   margin: 0px 3px;
   border-radius: 8px;
   border: 0;
 }
 
 #quick-filter-bar toolbarbutton:not([checked="true"]):hover {
   background-image: linear-gradient(#BBBBBB, #B5B5B5);
   color: #efefef !important;
-  text-shadow: 0 1px rgba(0, 0, 0, .4);
+  text-shadow: none;
 }
 
 #quick-filter-bar toolbarbutton:not([checked="true"]):active,
 #quick-filter-bar toolbarbutton[checked="true"]:active {
   background-image: linear-gradient(#7A7A7A, #6D6D6D);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), inset 0 -1px 1px rgba(0, 0, 0, 0.2);
   color: #efefef !important;
   text-shadow: 0 1px rgba(0, 0, 0, .4);
@@ -81,173 +80,66 @@
 
 #quick-filter-bar toolbarbutton[checked="true"] {
   background-image: linear-gradient(#999999, #858585);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), inset 0 -1px 1px rgba(0, 0, 0, 0.2);
   color: #efefef !important;
   text-shadow: 0 1px rgba(0, 0, 0, .4);
 }
 
-#quick-filter-bar-main-bar toolbarbutton > .toolbarbutton-icon {
-  padding: 0;
-  margin: 0;
-  width: 14px;
-  height: 14px;
+#quick-filter-bar-main-bar toolbarbutton {
+  height: 18px;
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+}
+
+#quick-filter-bar-main-bar toolbarbutton:not(#qfb-sticky) > .toolbarbutton-icon {
+  margin-inline-end: 2px;
 }
 
 #quick-filter-bar toolbarbutton > .toolbarbutton-text {
   padding: 0;
   margin: 0 2px;
 }
 
 #quick-filter-bar-expando toolbarbutton {
   margin-bottom: 3px;
 }
 
 #qfb-sticky {
-  width: 16px;
+  border-radius: 2px !important;
+  width: 18px;
   margin-inline-start: 6px !important;
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 14px 14px 0px);
-}
-
-#qfb-sticky[checked],
-#qfb-sticky:hover,
-#qfb-sticky:active {
-  border-radius: 2px;
-  -moz-image-region: rect(28px 14px 42px 0px);
+  list-style-image: url("chrome://messenger/skin/icons/sticky.svg");
 }
 
 /* we use both IDs so we are more precise than the other # toolbarbutton rules */
 #quick-filter-bar #qfb-sticky > .toolbarbutton-text {
   margin: 0;
 }
 
 #qfb-unread {
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 28px 14px 14px);
-}
-
-#qfb-unread[checked],
-#qfb-unread:hover,
-#qfb-unread:active {
-  -moz-image-region: rect(28px 28px 42px 14px);
+  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
 }
 
 #qfb-starred {
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 42px 14px 28px);
-}
-
-#qfb-starred[checked],
-#qfb-starred:hover,
-#qfb-starred:active {
-  -moz-image-region: rect(28px 42px 42px 28px);
+  list-style-image: url("chrome://messenger/skin/icons/star.svg");
 }
 
 #qfb-inaddrbook {
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 56px 14px 42px);
-}
-
-#qfb-inaddrbook[checked],
-#qfb-inaddrbook:hover,
-#qfb-inaddrbook:active {
-  -moz-image-region: rect(28px 56px 42px 42px);
+  list-style-image: url("chrome://messenger/skin/icons/address.svg")
 }
 
 #qfb-tags {
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 70px 14px 56px);
-}
-
-#qfb-tags[checked],
-#qfb-tags:hover,
-#qfb-tags:active {
-  -moz-image-region: rect(28px 70px 42px 56px);
+  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
 }
 
 #qfb-attachment {
-  list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar.png");
-  -moz-image-region: rect(0px 84px 14px 70px);
-}
-
-#qfb-attachment[checked],
-#qfb-attachment:hover,
-#qfb-attachment:active {
-  -moz-image-region: rect(28px 84px 42px 70px);
-}
-
-@media (min-resolution: 2dppx) {
-  #qfb-sticky {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 28px 28px 0px);
-  }
-
-  #qfb-sticky[checked],
-  #qfb-sticky:hover,
-  #qfb-sticky:active {
-    border-radius: 2px;
-    -moz-image-region: rect(56px 28px 84px 0px);
-  }
-
-  #qfb-unread {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 56px 28px 28px);
-  }
-
-  #qfb-unread[checked],
-  #qfb-unread:hover,
-  #qfb-unread:active {
-    -moz-image-region: rect(56px 56px 84px 28px);
-  }
-
-  #qfb-starred {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 84px 28px 56px);
-  }
-
-  #qfb-starred[checked],
-  #qfb-starred:hover,
-  #qfb-starred:active {
-    -moz-image-region: rect(56px 84px 84px 56px);
-  }
-
-  #qfb-inaddrbook {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 112px 28px 84px);
-  }
-
-  #qfb-inaddrbook[checked],
-  #qfb-inaddrbook:hover,
-  #qfb-inaddrbook:active {
-    -moz-image-region: rect(56px 112px 84px 84px);
-  }
-
-  #qfb-tags {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 140px 28px 112px);
-  }
-
-  #qfb-tags[checked],
-  #qfb-tags:hover,
-  #qfb-tags:active {
-    -moz-image-region: rect(56px 140px 84px 112px);
-  }
-
-  #qfb-attachment {
-    list-style-image: url("chrome://messenger/skin/icons/QFB-toolbar@2x.png");
-    -moz-image-region: rect(0px 168px 28px 140px);
-  }
-
-  #qfb-attachment[checked],
-  #qfb-attachment:hover,
-  #qfb-attachment:active {
-    -moz-image-region: rect(56px 168px 84px 140px);
-  }
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
 }
 
 #quick-filter-bar[filterActive="matches"] #qfb-results-label {
   color: green;
 }
 
 #quick-filter-bar[filterActive="nomatches"] #qfb-results-label {
   color: #f66;
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -52,16 +52,18 @@
   skin/classic/messenger/icons/reply.svg                      (../shared/mail/icons/reply.svg)
   skin/classic/messenger/icons/replyall.svg                   (../shared/mail/icons/replyall.svg)
   skin/classic/messenger/icons/replylist.svg                  (../shared/mail/icons/replylist.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/save.svg                       (../shared/mail/icons/save.svg)
   skin/classic/messenger/icons/security.svg                   (../shared/mail/icons/security.svg)
   skin/classic/messenger/icons/send.svg                       (../shared/mail/icons/send.svg)
   skin/classic/messenger/icons/spelling.svg                   (../shared/mail/icons/spelling.svg)
+  skin/classic/messenger/icons/star.svg                       (../shared/mail/icons/star.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/tag.svg                        (../shared/mail/icons/tag.svg)
   skin/classic/messenger/icons/toolbarbutton-arrow.svg        (../shared/mail/icons/toolbarbutton-arrow.svg)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/in-content/dialog.css         (../shared/mail/incontentprefs/dialog.css)
   skin/classic/messenger/shared/in-content/aboutPreferences.css (../shared/mail/incontentprefs/aboutPreferences.css)
   skin/classic/messenger/shared/in-content/account.svg        (../shared/mail/incontentprefs/account.svg)
--- a/mail/themes/shared/mail/icons/attach.svg
+++ b/mail/themes/shared/mail/icons/attach.svg
@@ -1,6 +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="M12 12V3.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5V12zM7 4.5V11H6V4.5c0-.28.22-.5.5-.5s.5.22.5.5zM4 3c0-1.66 1.34-3 3-3s3 1.34 3 3v8H9V4H5v8H4zm3 8c0 .55.45 1 1 1s1-.45 1-1h1c0 1.1-.9 2-2 2s-2-.9-2-2zm-2 1c0 1.66 1.34 3 3 3s3-1.34 3-3h1c0 2.2-1.8 4-4 4s-4-1.8-4-4zm0-9v1h4V3zm4 0c0-1.1-.9-2-2-2s-2 .9-2 2z"/>
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M12 12V3.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5V12zM7 4.5V11H6V4.5c0-.28.22-.5.5-.5s.5.22.5.5zM4 3c0-1.66 1.34-3 3-3s3 1.34 3 3v8H9V4H5v8H4zm3 8c0 .55.45 1 1 1s1-.45 1-1h1c0 1.1-.9 2-2 2s-2-.9-2-2zm-2 1c0 1.66 1.34 3 3 3s3-1.34 3-3h1c0 2.2-1.8 4-4 4s-4-1.8-4-4zm0-9v1h4V3zm4 0c0-1.1-.9-2-2-2s-2 .9-2 2z"/>
 </svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/star.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" fill-opacity="context-fill-opacity" d="M12.82 15.5L8 13.04l-4.77 2.42 1.13-5.36L.5 6.56l5.2-.7L8.1.5l2.13 5.33 5.3.73-3.6 3.65z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/sticky.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" fill-opacity="context-fill-opacity" d="M0 3.54L3.54 0h1.4v1.4L8.5 5h2.84l1.4 1.36-2.46 2.48 4.6 4.6-1.42 1.4-4.6-4.58-2.48 2.47L5 11.33V8.47l-3.6-3.5H0z"/>
+</svg>
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -144,17 +144,16 @@ classic.jar:
   skin/classic/messenger/icons/thread-watched.png             (mail/icons/thread-watched.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flag-col.svg                   (mail/icons/flag-col.svg)
   skin/classic/messenger/icons/flag-empty.png                 (mail/icons/flag-empty.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/read.png                       (mail/icons/read.png)
   skin/classic/messenger/icons/readcol.svg                    (mail/icons/readcol.svg)
   skin/classic/messenger/icons/unreadmail.png                 (mail/icons/unreadmail.png)
-  skin/classic/messenger/icons/quick-search-icons.png         (mail/icons/quick-search-icons.png)
   skin/classic/messenger/icons/search-arrow.gif               (mail/icons/search-arrow.gif)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
deleted file mode 100644
index 36b557934372a40f4db86cb6c5ebec9abc0f36f2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/windows/mail/quickFilterBar.css
+++ b/mail/themes/windows/mail/quickFilterBar.css
@@ -49,69 +49,67 @@
   padding-bottom: 3px;
 }
 
 /* :::: Filter Buttons :::: */
 
 #quick-filter-bar toolbarbutton {
   min-height: 19px;
   border: 1px solid transparent;
-  padding: 1px 3px;
+  padding: 2px 3px;
   margin-inline-start: 1px;
   margin-inline-end: 1px;
 }
 
 #quick-filter-bar-main-bar toolbarbutton {
   min-width: 22px;
   margin-inline-start: 1px;
   margin-inline-end: 1px;
-  list-style-image: url("chrome://messenger/skin/icons/quick-search-icons.png");
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 /* keep that hideous outline focus ring from showing on the checked buttons */
 #quick-filter-bar-main-bar toolbarbutton:focus {
   outline: none;
 }
 
 #qfb-boolean-mode {
   margin: 0 1px;
   padding-top: 0 !important;
   padding-bottom: 0 !important;
 }
 
 #qfb-sticky {
-  -moz-image-region: rect(0 16px 16px 0);
+  list-style-image: url("chrome://messenger/skin/icons/sticky.svg");
 }
 
 #qfb-sticky[checked] {
-  -moz-image-region: rect(0 32px 16px 16px);
+  fill: #b20606;
 }
 
 #qfb-unread {
-  -moz-image-region: rect(0 48px 16px 32px);
+  list-style-image: url("chrome://messenger/skin/icons/mark.svg");
 }
 
 #qfb-starred {
-  -moz-image-region: rect(0 64px 16px 48px);
+  list-style-image: url("chrome://messenger/skin/icons/star.svg");
 }
 
 #qfb-inaddrbook {
-  -moz-image-region: rect(0 80px 16px 64px);
+  list-style-image: url("chrome://messenger/skin/icons/address.svg")
 }
 
 #qfb-tags {
-  -moz-image-region: rect(0 112px 16px 96px);
-}
-
-#qfb-tags[disabled] > .toolbarbutton-icon {
-  opacity: .4;
+  list-style-image: url("chrome://messenger/skin/icons/tag.svg");
 }
 
 #qfb-attachment {
-  -moz-image-region: rect(0 96px 16px 80px);
+  list-style-image: url("chrome://messenger/skin/icons/attach.svg");
 }
 
 #quick-filter-bar[filterActive="matches"] #qfb-results-label {
   color: green;
 }
 
 #quick-filter-bar[filterActive="nomatches"] #qfb-results-label {
   color: #f66;