Bug 1636429 - Use SVG icons for the checkmarks in trees. r=aleca DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Sat, 09 May 2020 13:53:30 +0300
changeset 39104 bb8c9919df27708c9dd4a861e360a98343b974c3
parent 39103 844fa53f6c01096df843206443bff07dae12ec05
child 39105 216dd6f69088ed1ca6c8697945110a75b51c3c94
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersaleca
bugs1636429
Bug 1636429 - Use SVG icons for the checkmarks in trees. r=aleca DONTBUILD
mail/themes/linux/jar.mn
mail/themes/linux/mail/filterDialog.css
mail/themes/linux/mail/icons/check.gif
mail/themes/linux/mail/icons/notchecked.gif
mail/themes/linux/mail/msgSelectOffline.css
mail/themes/linux/mail/subscribe.css
mail/themes/linux/mail/virtualFolderListDialog.css
mail/themes/osx/jar.mn
mail/themes/osx/mail/filterDialog.css
mail/themes/osx/mail/icons/check.png
mail/themes/osx/mail/icons/dot.png
mail/themes/osx/mail/msgSelectOffline.css
mail/themes/osx/mail/subscribe.css
mail/themes/osx/mail/virtualFolderListDialog.css
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/filterDialog.css
mail/themes/shared/mail/mailWindow1.css
mail/themes/shared/mail/msgSelectOffline.css
mail/themes/shared/mail/subscribe.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/filterDialog.css
mail/themes/windows/mail/icons/check.gif
mail/themes/windows/mail/icons/notchecked.gif
mail/themes/windows/mail/msgSelectOffline.css
mail/themes/windows/mail/subscribe.css
mail/themes/windows/mail/virtualFolderListDialog.css
mailnews/base/content/virtualFolderListEdit.xhtml
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -34,20 +34,17 @@ classic.jar:
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                     (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
   skin/classic/messenger/folderPane.css                       (mail/folderPane.css)
-  skin/classic/messenger/subscribe.css                        (mail/subscribe.css)
-  skin/classic/messenger/virtualFolderListDialog.css          (mail/virtualFolderListDialog.css)
   skin/classic/messenger/searchDialog.css                     (mail/searchDialog.css)
-  skin/classic/messenger/msgSelectOffline.css                 (mail/msgSelectOffline.css)
   skin/classic/messenger/filterDialog.css                     (mail/filterDialog.css)
   skin/classic/messenger/multimessageview.css                 (mail/multimessageview.css)
   skin/classic/messenger/glodaFacetView.css                   (mail/glodaFacetView.css)
   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/dialogs.css                          (mail/dialogs.css)
   skin/classic/messenger/newmailalert.css                     (mail/newmailalert.css)
   skin/classic/messenger/tabmail.css                          (mail/tabmail.css)
@@ -112,18 +109,16 @@ classic.jar:
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png   (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/search-arrow.png               (mail/icons/search-arrow.png)
   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/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/dropmarker.svg                 (mail/icons/dropmarker.svg)
   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/accountcentral/read-messages.png     (mail/accountcentral/read-messages.png)
   skin/classic/messenger/accountcentral/write-message.png     (mail/accountcentral/write-message.png)
--- a/mail/themes/linux/mail/filterDialog.css
+++ b/mail/themes/linux/mail/filterDialog.css
@@ -1,92 +1,40 @@
 /* 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/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/shared/filterDialog.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
-treecolpicker {
-  display: none;
-}
-
-richlistitem {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-richlistitem > checkbox {
-  width: 100px;
-  margin: 0;
-  -moz-user-focus: none;
-}
-
-checkbox:not([label]) .checkbox-label-box {
-  display: none;
-}
-
 #gray_horizontal_splitter {
-  margin-right: -6px;
-  margin-left: -6px;
+  margin-inline: -6px;
 }
 
 #filterHeader,
 #filterListGrid {
   margin: 8px 6px 0;
 }
 
 #FilterEditor {
-  padding-right: 4px;
-  padding-left: 4px;
+  padding-inline: 4px;
 }
 
 .small-button {
   min-width: 3em;
   padding: 0;
   margin: 2px;
 }
 
 .small-button + .small-button {
-  margin-inline-start: 0;
-  margin-inline-end: 4px;
-}
-
-.search-menulist,
-.search-value-menulist {
-  width: 12em;
-}
-
-.search-menulist[unavailable="true"] {
-  color: GrayText;
+  margin-inline: 0 4px;
 }
 
 .search-value-textbox {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.ruleactionitem {
-  min-width: 20em;
-}
-
-.ruleaction-type {
-  min-width: 15em;
+  padding-block: 0;
 }
-
-#countBox[filterActive="matches"] {
-  color: #4e9a06;
-}
-
-#countBox[filterActive="nomatches"] {
-  color: #cc0000;
-}
-
-treecolpicker {
-  display: none;
-}
deleted file mode 100644
index 71e3a7751a254d10ee868d5b58f62c81a07844f8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d3384cb35238b2b8f8b277679d8c7b5c643b0dd8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mail/themes/linux/mail/msgSelectOffline.css
+++ /dev/null
@@ -1,32 +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/. */
-
-/* ===== msgSelectOffline.css =================================================
-   == The dialog where you select which folders to enable for offline use.
-   ========================================================================== */
-
-@import url("chrome://messenger/skin/messenger.css");
-@import url("chrome://messenger/skin/folderPane.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(syncCol) {
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
-}
-
-treechildren::-moz-tree-image(syncCol, synchronize-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
-}
-
-treechildren::-moz-tree-image(syncCol, isServer-true) {
-  list-style-image: none;
-}
-
-#folderNameCol [sortDirection="ascending"] {
-  list-style-image: none;
-}
-
-#folderNameCol [sortDirection="descending"] {
-  list-style-image: none;
-}
deleted file mode 100644
--- a/mail/themes/linux/mail/subscribe.css
+++ /dev/null
@@ -1,47 +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/. */
-
-/* ===== subscribe.css ==================================================
-  == Styles for the Subscribe dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/messenger.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: Subscription Icons  :::::: */
-
-treechildren::-moz-tree-image(subscribedColumn),
-treechildren::-moz-tree-image(subscribedColumn2) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
-}
-
-treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
-treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
-}
-
-treechildren::-moz-tree-image(subscribedColumn, subscribable-false) {
-  list-style-image: none;
-}
-
-treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
-  color: gray;
-  font-style: italic;
-}
-
-/* IMAP Folders*/
-treechildren::-moz-tree-image(nameColumn) {
-  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
-  margin-inline-end: 2px;
-}
-
-/* Newsgroups */
-treechildren::-moz-tree-image(nameColumn, serverType-nntp),
-treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
-  margin-inline-end: 2px;
-}
-
deleted file mode 100644
--- a/mail/themes/linux/mail/virtualFolderListDialog.css
+++ /dev/null
@@ -1,20 +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/. */
-
-/* ===== subscribe.css ==================================================
-  == Styles for the virtual folder list dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/mailWindow1.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(selectedColumn) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
-}
-
-treechildren::-moz-tree-image(selectedColumn, selected-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
-}
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -30,25 +30,22 @@ classic.jar:
   skin/classic/messenger/section_collapsed.png                   (mail/section_collapsed.png)
   skin/classic/messenger/section_expanded.png                    (mail/section_expanded.png)
   skin/classic/messenger/menulist.css                            (mail/menulist.css)
   skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
   skin/classic/messenger/messageHeader.css                       (mail/messageHeader.css)
   skin/classic/messenger/messageIcons.css                        (mail/messageIcons.css)
   skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
   skin/classic/messenger/attachmentList.css                      (mail/attachmentList.css)
-  skin/classic/messenger/msgSelectOffline.css                    (mail/msgSelectOffline.css)
   skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
   skin/classic/messenger/searchBox.css                           (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                            (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                        (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                         (mail/folderMenus.css)
   skin/classic/messenger/folderPane.css                          (mail/folderPane.css)
-  skin/classic/messenger/subscribe.css                           (mail/subscribe.css)
-  skin/classic/messenger/virtualFolderListDialog.css             (mail/virtualFolderListDialog.css)
   skin/classic/messenger/searchDialog.css                        (mail/searchDialog.css)
   skin/classic/messenger/filterDialog.css                        (mail/filterDialog.css)
   skin/classic/messenger/tabmail.css                             (mail/tabmail.css)
   skin/classic/messenger/themeableDialog.css                     (mail/themeableDialog.css)
   skin/classic/messenger/editContactPanel.css                    (mail/editContactPanel.css)
   skin/classic/messenger/quickFilterBar.css                      (mail/quickFilterBar.css)
   skin/classic/messenger/activity/activity.css                   (mail/activity/activity.css)
   skin/classic/messenger/activity/buttons.png                    (mail/activity/buttons.png)
@@ -102,18 +99,16 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrSignOkUnverified.png     (mail/smime/hdrSignOkUnverified.png)
   skin/classic/messenger/smime/icons/hdrSignUnknown.png          (mail/smime/hdrSignUnknown.png)
   skin/classic/messenger/smime/icons/hdrSignNotOk.png            (mail/smime/hdrSignNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png             (mail/smime/hdrCryptoOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png          (mail/smime/hdrCryptoNotOk.png)
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
   skin/classic/messenger/icons/attachment-deleted.png            (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png      (mail/icons/attachment-deleted-large.png)
-  skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
-  skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
   skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
   skin/classic/messenger/icons/multicolor.png                    (mail/icons/multicolor.png)
   skin/classic/messenger/icons/secure.png                        (mail/icons/secure.png)
   skin/classic/messenger/icons/server.png                        (mail/icons/server.png)
   skin/classic/messenger/icons/server@2x.png                     (mail/icons/server@2x.png)
   skin/classic/messenger/icons/chat-16@2x.png                    (mail/icons/chat-16@2x.png)
   skin/classic/messenger/icons/insecure.png                      (mail/icons/insecure.png)
--- a/mail/themes/osx/mail/filterDialog.css
+++ b/mail/themes/osx/mail/filterDialog.css
@@ -1,97 +1,51 @@
 /* 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/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/shared/filterDialog.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #filterListDialog {
-  padding: 0px;
+  padding: 0;
 }
 
 #filterHeader {
   margin: 8px;
   font: menu;
 }
 
 #filterListGrid {
   margin: 8px;
 }
 
 /* ::::: columns :::::: */
 
-treecolpicker {
-  display: none;
-}
-
-richlistitem {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-richlistitem > checkbox {
-  width: 100px;
-  margin: 0;
-  -moz-user-focus: none;
-}
-
-checkbox:not([label]) .checkbox-label-box {
-  display: none;
-}
-
 .small-button {
   min-width: 22px;
   height: 20px;
-  padding: 0 1px 1px 0;
+  padding-block: 0 1px;
+  padding-inline: 0 1px;
   margin: 4px 0;
 }
 
 .small-button:first-child {
   margin-inline-start: 2px;
 }
 
 listcell > hbox {
   -moz-box-pack: end;
 }
 
 /* No '.filler' here, so add margin to make more room. */
 hbox > .small-button + .small-button {
   margin-inline-end: 2px;
 }
 
-.search-menulist, .search-value-menulist {
-  width: 12em;
-}
-
-.search-menulist[unavailable="true"] {
-  color: GrayText;
-}
-
 #searchTermList > listitem[selected="true"] {
   background-color: inherit;
 }
-
-.ruleactionitem {
-  min-width: 20em;
-}
-
-.ruleaction-type {
-  min-width: 15em;
-}
-
-#countBox[filterActive="matches"] {
-  color: #4e9a06;
-}
-
-#countBox[filterActive="nomatches"] {
-  color: #cc0000;
-}
-
-treecolpicker {
-  display: none;
-}
deleted file mode 100644
index c1456455eac9df45c99ff544032ead947fb67aa5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fe80b779d657a067ce0773715b8cd84a03a0809d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mail/themes/osx/mail/msgSelectOffline.css
+++ /dev/null
@@ -1,39 +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/. */
-
-/* ===== msgSelectOffline.css =================================================
-  == Styles for the Offline Use dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/messenger.css");
-@import url("chrome://messenger/skin/folderPane.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
-  font-style: italic;
-}
-
-/* ::::: Download Icons ::::: */
-
-treechildren::-moz-tree-image(syncCol) {
-  list-style-image: url("chrome://messenger/skin/icons/dot.png");
-}
-
-treechildren::-moz-tree-image(syncCol, synchronize-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.png");
-}
-
-treechildren::-moz-tree-image(syncCol, isServer-true) {
-  list-style-image: none;
-}
-
-#folderNameCol [sortDirection="ascending"] {
-  list-style-image: none;
-}
-
-#folderNameCol [sortDirection="descending"] {
-  list-style-image: none;
-}
deleted file mode 100644
--- a/mail/themes/osx/mail/subscribe.css
+++ /dev/null
@@ -1,51 +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/. */
-
-/* ===== subscribe.css ==================================================
-  == Styles for the Subscribe dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/messenger.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: subscribed icons  :::::: */
-
-treechildren::-moz-tree-image(subscribedColumn),
-treechildren::-moz-tree-image(subscribedColumn2) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/dot.png");
-}
-
-treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
-treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.png");
-}
-
-/* ::::: folder icons :::::: */
-
-treechildren::-moz-tree-image(nameColumn) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder.svg");
-}
-
-treechildren::-moz-tree-image(nameColumn, serverType-nntp),
-treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
-}
-
-/* ::::: server icons :::::: */
-
-.subscribeMenuItem {
-  list-style-image: url("chrome://messenger/skin/icons/message.svg");
-}
-
-.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/icons/message-secure.svg");
-}
-
-.subscribeMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/globe.svg");
-}
deleted file mode 100644
--- a/mail/themes/osx/mail/virtualFolderListDialog.css
+++ /dev/null
@@ -1,20 +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/. */
-
-/* ===== subscribe.css ==================================================
-  == Styles for the virtual folder list dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/mailWindow1.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(selectedColumn) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/dot.png");
-}
-
-treechildren::-moz-tree-image(selectedColumn, selected-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.png");
-}
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -4,21 +4,24 @@
 
 # This is not a complete / proper jar manifest. It is included by the
 # actual theme-specific manifests, so that shared resources need only
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
   skin/classic/messenger/aboutNetError.css                    (../shared/mail/aboutNetError.css)
   skin/classic/messenger/aboutSupport.css                     (../shared/mail/aboutSupport.css)
+  skin/classic/messenger/folderProps.css                      (../shared/mail/folderProps.css)
   skin/classic/messenger/messageQuotes.css                    (../shared/mail/messageQuotes.css)
+  skin/classic/messenger/msgSelectOffline.css                 (../shared/mail/msgSelectOffline.css)
+  skin/classic/messenger/subscribe.css                        (../shared/mail/subscribe.css)
+  skin/classic/messenger/tagColors.css                        (../shared/mail/tagColors.css)
   skin/classic/messenger/addressbook/abResultsPane.css        (../shared/mail/abResultsPane.css)
   skin/classic/messenger/addressbook/icons/menu.svg           (../shared/mail/icons/menu.svg)
   skin/classic/messenger/downloads/download.svg               (../shared/mail/icons/download.svg)
-  skin/classic/messenger/folderProps.css                      (../shared/mail/folderProps.css)
   skin/classic/messenger/icons/ablist.svg                     (../shared/mail/icons/ablist.svg)
   skin/classic/messenger/icons/address.svg                    (../shared/mail/icons/address.svg)
   skin/classic/messenger/icons/addcontact.svg                 (../shared/mail/icons/addcontact.svg)
   skin/classic/messenger/icons/addlist.svg                    (../shared/mail/icons/addlist.svg)
   skin/classic/messenger/icons/accounts.svg                   (../shared/mail/icons/accounts.svg)
   skin/classic/messenger/icons/addon-install-blocked.svg      (../shared/mail/icons/addon-install-blocked.svg)
   skin/classic/messenger/icons/addon-install-confirm.svg      (../shared/mail/icons/addon-install-confirm.svg)
   skin/classic/messenger/icons/addon-install-downloading.svg  (../shared/mail/icons/addon-install-downloading.svg)
@@ -172,16 +175,17 @@
   skin/classic/messenger/shared/accountCreation.css           (../shared/mail/accountCreation.css)
   skin/classic/messenger/shared/newInstallPage.css            (../shared/mail/newInstallPage.css)
   skin/classic/messenger/shared/accountManage.css             (../shared/mail/accountManage.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/compacttheme.css              (../shared/mail/compacttheme.css)
   skin/classic/messenger/shared/creationDialog.css            (../shared/mail/creationDialog.css)
   skin/classic/messenger/shared/EditorDialog.css              (../shared/mail/EditorDialog.css)
+  skin/classic/messenger/shared/filterDialog.css              (../shared/mail/filterDialog.css)
   skin/classic/messenger/shared/folderMenus.css               (../shared/mail/folderMenus.css)
   skin/classic/messenger/shared/folderPane.css                (../shared/mail/folderPane.css)
   skin/classic/messenger/shared/preferences/applications.css  (../shared/mail/preferences/applications.css)
   skin/classic/messenger/shared/preferences/dialog.css        (../shared/mail/preferences/dialog.css)
   skin/classic/messenger/shared/preferences/passwordmgr.css   (../shared/mail/preferences/passwordmgr.css)
   skin/classic/messenger/shared/preferences/preferences.css   (../shared/mail/preferences/preferences.css)
   skin/classic/messenger/shared/preferences/calendar.svg      (../shared/mail/preferences/calendar.svg)
   skin/classic/messenger/shared/preferences/chat.svg          (../shared/mail/preferences/chat.svg)
@@ -193,17 +197,16 @@
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/messageIcons.css              (../shared/mail/messageIcons.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messengercompose.css          (../shared/mail/messengercompose.css)
   skin/classic/messenger/shared/searchBox.css                 (../shared/mail/searchBox.css)
   skin/classic/messenger/shared/searchDialog.css              (../shared/mail/searchDialog.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/themeableDialog.css           (../shared/mail/themeableDialog.css)
-  skin/classic/messenger/tagColors.css                        (../shared/mail/tagColors.css)
   skin/classic/messenger/shared/smime/smime-compose.css       (../shared/mail/smime/smime-compose.css)
 * skin/classic/messenger/shared/customizableui/panelUI.css    (../shared/customizableui/panelUI.css)
   skin/classic/messenger/shared/grid-layout.css               (../shared/mail/grid-layout.css)
   skin/classic/messenger/shared/input-fields.css              (../shared/mail/input-fields.css)
   skin/classic/messenger/messengercompose/format-dropmarker.svg (../shared/mail/icons/format-dropmarker.svg)
 #ifndef XP_MACOSX
   skin/classic/messenger/shared/newmailalert.css              (../shared/mail/newmailalert.css)
 #endif
copy from mail/themes/windows/mail/filterDialog.css
copy to mail/themes/shared/mail/filterDialog.css
--- a/mail/themes/windows/mail/filterDialog.css
+++ b/mail/themes/shared/mail/filterDialog.css
@@ -12,74 +12,45 @@
 
 /* ::::: columns :::::: */
 
 treecolpicker {
   display: none;
 }
 
 richlistitem {
-  padding-top: 1px;
-  padding-bottom: 1px;
+  padding-block: 1px;
 }
 
 richlistitem > checkbox {
   width: 100px;
   margin: 0;
   -moz-user-focus: none;
 }
 
 checkbox:not([label]) .checkbox-label-box {
   display: none;
 }
 
-#gray_horizontal_splitter {
-  margin-right: -6px;
-  margin-left: -6px;
-}
-
-#filterHeader,
-#filterListGrid {
-  margin: 8px 6px 0;
-}
-
-#FilterEditor {
-  padding-right: 4px;
-  padding-left: 4px;
-}
-
-.small-button {
-  min-width: 3em;
-  margin: 1px 2px;
-}
-
-.small-button + .small-button {
-  margin-inline-start: 0;
-  margin-inline-end: 4px;
-}
-
-.search-menulist, .search-value-menulist {
+.search-menulist,
+.search-value-menulist {
   width: 12em;
 }
 
 .search-menulist[unavailable="true"] {
-  color: GrayText;
+  opacity: 0.6;
 }
 
 .ruleactionitem {
   min-width: 20em;
 }
 
 .ruleaction-type {
   min-width: 15em;
 }
 
 #countBox[filterActive="matches"] {
   color: #4e9a06;
 }
 
 #countBox[filterActive="nomatches"] {
-  color: #cc0000;
+  color: #c00;
 }
-
-treecolpicker {
-  display: none;
-}
--- a/mail/themes/shared/mail/mailWindow1.css
+++ b/mail/themes/shared/mail/mailWindow1.css
@@ -124,8 +124,30 @@ treechildren::-moz-tree-cell-text(dummy)
   box-shadow: 0 1px 3px rgba(255, 255, 255, .15);
 }
 
 :root[lwt-tree] #qfb-qs-textbox[focused="true"] {
   background-color: var(--lwt-toolbar-field-focus, var(--lwt-toolbar-field-background-color, white));
   color: var(--lwt-toolbar-field-focus-color, var(--lwt-toolbar-field-color, black));
   border-color: var(--toolbar-field-focus-border-color);
 }
+
+/* virtual folder list dialog */
+
+treechildren::-moz-tree-image(selectedColumn) {
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://messenger/skin/icons/checkbox.svg");
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected-true) {
+  fill-opacity: 1;
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected, focus) {
+  fill: var(--select-focus-text-color);
+  stroke: var(--select-focus-text-color);
+}
rename from mail/themes/windows/mail/msgSelectOffline.css
rename to mail/themes/shared/mail/msgSelectOffline.css
--- a/mail/themes/windows/mail/msgSelectOffline.css
+++ b/mail/themes/shared/mail/msgSelectOffline.css
@@ -7,28 +7,40 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
+  opacity: 0.6;
   font-style: italic;
 }
 
 /* ::::: Download Icons ::::: */
 
 treechildren::-moz-tree-image(syncCol) {
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://messenger/skin/icons/checkbox.svg");
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0;
+  stroke-opacity: 0;
 }
 
 treechildren::-moz-tree-image(syncCol, synchronize-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
+  fill-opacity: 1;
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected, focus) {
+  fill: var(--select-focus-text-color);
+  stroke: var(--select-focus-text-color);
 }
 
 treechildren::-moz-tree-image(syncCol, isServer-true) {
   list-style-image: none;
 }
 
 #folderNameCol [sortDirection="ascending"] {
   list-style-image: none;
rename from mail/themes/windows/mail/subscribe.css
rename to mail/themes/shared/mail/subscribe.css
--- a/mail/themes/windows/mail/subscribe.css
+++ b/mail/themes/shared/mail/subscribe.css
@@ -9,31 +9,43 @@
 @import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: Subscription Icons  :::::: */
 
 treechildren::-moz-tree-image(subscribedColumn),
 treechildren::-moz-tree-image(subscribedColumn2) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
+  width: 14px;
+  height: 14px;
+  list-style-image: url("chrome://messenger/skin/icons/checkbox.svg");
+  -moz-context-properties: fill, fill-opacity, stroke, stroke-opacity;
+  fill: currentColor;
+  stroke: currentColor;
+  fill-opacity: 0;
+  stroke-opacity: 0;
 }
 
 treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
 treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
+  fill-opacity: 1;
+}
+
+treechildren::-moz-tree-image(subscribedColumn, selected, focus),
+treechildren::-moz-tree-image(subscribedColumn2, selected, focus) {
+  fill: var(--select-focus-text-color);
+  stroke: var(--select-focus-text-color);
 }
 
 treechildren::-moz-tree-image(subscribedColumn, subscribable-false) {
   list-style-image: none;
 }
 
 treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
-  color: gray;
+  opacity: 0.6;
   font-style: italic;
 }
 
 /* ::::: Folders :::::: */
 
 treechildren::-moz-tree-image(nameColumn) {
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/icons/folder.svg");
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -34,20 +34,17 @@ classic.jar:
   skin/classic/messenger/imageFilters.svg                     (mail/imageFilters.svg)
   skin/classic/messenger/mailWindow1.css                      (mail/mailWindow1.css)
   skin/classic/messenger/messageWindow.css                    (mail/messageWindow.css)
   skin/classic/messenger/searchBox.css                        (mail/searchBox.css)
   skin/classic/messenger/junkMail.css                         (mail/junkMail.css)
   skin/classic/messenger/input-fields.css                     (mail/input-fields.css)
   skin/classic/messenger/folderMenus.css                      (mail/folderMenus.css)
   skin/classic/messenger/folderPane.css                       (mail/folderPane.css)
-  skin/classic/messenger/subscribe.css                        (mail/subscribe.css)
-  skin/classic/messenger/virtualFolderListDialog.css          (mail/virtualFolderListDialog.css)
   skin/classic/messenger/searchDialog.css                     (mail/searchDialog.css)
-  skin/classic/messenger/msgSelectOffline.css                 (mail/msgSelectOffline.css)
   skin/classic/messenger/filterDialog.css                     (mail/filterDialog.css)
   skin/classic/messenger/dialogs.css                          (mail/dialogs.css)
   skin/classic/messenger/multimessageview.css                 (mail/multimessageview.css)
   skin/classic/messenger/glodaFacetView.css                   (mail/glodaFacetView.css)
   skin/classic/messenger/newmailalert.css                     (mail/newmailalert.css)
   skin/classic/messenger/tabmail.css                          (mail/tabmail.css)
   skin/classic/messenger/themeableDialog.css                  (mail/themeableDialog.css)
   skin/classic/messenger/editContactPanel.css                 (mail/editContactPanel.css)
@@ -98,18 +95,16 @@ classic.jar:
   skin/classic/messenger/icons/zoomout-hover.png              (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/multicolor.png                 (mail/icons/multicolor.png)
   skin/classic/messenger/icons/license.txt                    (mail/icons/license.txt)
   skin/classic/messenger/icons/attachment-deleted.png         (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png   (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/flag-col.png                   (mail/icons/flag-col.png)
   skin/classic/messenger/icons/server.png                     (mail/icons/server.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.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/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/mainwindow-dropdown-arrow.png  (mail/icons/mainwindow-dropdown-arrow.png)
   skin/classic/messenger/icons/mainwindow-dropdown-arrow-inverted.png (mail/icons/mainwindow-dropdown-arrow-inverted.png)
--- a/mail/themes/windows/mail/filterDialog.css
+++ b/mail/themes/windows/mail/filterDialog.css
@@ -1,85 +1,35 @@
 /* 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/. */
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/shared/filterDialog.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: columns :::::: */
 
-treecolpicker {
-  display: none;
-}
-
-richlistitem {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-richlistitem > checkbox {
-  width: 100px;
-  margin: 0;
-  -moz-user-focus: none;
-}
-
-checkbox:not([label]) .checkbox-label-box {
-  display: none;
-}
-
 #gray_horizontal_splitter {
-  margin-right: -6px;
-  margin-left: -6px;
+  margin-inline: -6px;
 }
 
 #filterHeader,
 #filterListGrid {
   margin: 8px 6px 0;
 }
 
 #FilterEditor {
-  padding-right: 4px;
-  padding-left: 4px;
+  padding-inline: 4px;
 }
 
 .small-button {
   min-width: 3em;
   margin: 1px 2px;
 }
 
 .small-button + .small-button {
-  margin-inline-start: 0;
-  margin-inline-end: 4px;
-}
-
-.search-menulist, .search-value-menulist {
-  width: 12em;
-}
-
-.search-menulist[unavailable="true"] {
-  color: GrayText;
-}
-
-.ruleactionitem {
-  min-width: 20em;
+  margin-inline: 0: 4px;
 }
-
-.ruleaction-type {
-  min-width: 15em;
-}
-
-#countBox[filterActive="matches"] {
-  color: #4e9a06;
-}
-
-#countBox[filterActive="nomatches"] {
-  color: #cc0000;
-}
-
-treecolpicker {
-  display: none;
-}
deleted file mode 100644
index 71e3a7751a254d10ee868d5b58f62c81a07844f8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d3384cb35238b2b8f8b277679d8c7b5c643b0dd8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mail/themes/windows/mail/virtualFolderListDialog.css
+++ /dev/null
@@ -1,20 +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/. */
-
-/* ===== subscribe.css ==================================================
-  == Styles for the virtual folder list dialog.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/mailWindow1.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treechildren::-moz-tree-image(selectedColumn) {
-  margin-inline-end: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/notchecked.gif");
-}
-
-treechildren::-moz-tree-image(selectedColumn, selected-true) {
-  list-style-image: url("chrome://messenger/skin/icons/check.gif");
-}
--- a/mailnews/base/content/virtualFolderListEdit.xhtml
+++ b/mailnews/base/content/virtualFolderListEdit.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.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/.
    -->
 
-<?xml-stylesheet href="chrome://messenger/skin/virtualFolderListDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/mailWindow1.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/virtualFolderListDialog.dtd">
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&virtualFolderListTitle.title;"
         windowtype="mailnews:virtualFolderList"
         style="width: 27em; height: 25em;"
         persist="width height screenX screenY"