Bug 1494672 - Fix tag selection in QFB by adding the toolbarbutton-1 class to the qfb-tag-button. r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Thu, 27 Sep 2018 19:49:43 +0200
changeset 33247 5664e476f06cdab4ccf1cea2c6e663298909e7b3
parent 33246 20b96eb01d6e51f0ae7b0f8f6dea5538b325f0f7
child 33248 a314b2757253f96e4b523cfc83d9bb6e1e5b1da4
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1494672
Bug 1494672 - Fix tag selection in QFB by adding the toolbarbutton-1 class to the qfb-tag-button. r=jorgk DONTBUILD
mail/base/modules/quickFilterManager.js
mail/themes/linux/mail/messenger.css
mail/themes/linux/mail/quickFilterBar.css
mail/themes/windows/mail/quickFilterBar.css
--- a/mail/base/modules/quickFilterManager.js
+++ b/mail/base/modules/quickFilterManager.js
@@ -891,19 +891,19 @@ var TagFacetingFilter = {
           if (!keywordMap[tag.key])
             button.setAttribute("inverted", "true");
         }
         button.setAttribute("label", tag.tag);
         button.setAttribute("value", tag.key);
         let color = tag.color;
         // everybody always gets to be an qfb-tag-button.
         if (color)
-          button.setAttribute("class", "qfb-tag-button lc-" + color.substr(1));
+          button.setAttribute("class", "toolbarbutton-1 qfb-tag-button lc-" + color.substr(1));
         else
-          button.setAttribute("class", "qfb-tag-button");
+          button.setAttribute("class", "toolbarbutton-1 qfb-tag-button");
         tagbar.appendChild(button);
       }
     }
     tagbar.collapsed = !addCount;
   },
 };
 QuickFilterManager.defineFilter(TagFacetingFilter);
 
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -324,16 +324,20 @@ toolbox[labelalign="end"] .toolbarbutton
 
 .toolbarbutton-1,
 .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   min-height: 24px;
   min-width: 32px;
   margin: 4px 1px;
   padding: 1px 6px !important;
+}
+
+.toolbarbutton-1:not(.qfb-tag-button),
+.toolbarbutton-menubutton-button {
   color: inherit !important;
 }
 
 .toolbarbutton-1[type="menu-button"] {
   -moz-appearance: none;
 }
 
 .findbar-button {
--- a/mail/themes/linux/mail/quickFilterBar.css
+++ b/mail/themes/linux/mail/quickFilterBar.css
@@ -44,16 +44,21 @@
 }
 
 #quick-filter-bar-main-bar toolbarbutton {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
+#quick-filter-bar-tab-bar > .qfb-tag-button {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 #qfb-sticky {
   list-style-image: url("chrome://messenger/skin/icons/sticky.svg");
 }
 
 #qfb-unread {
   list-style-image: url("chrome://messenger/skin/icons/mark.svg");
 }
 
--- a/mail/themes/windows/mail/quickFilterBar.css
+++ b/mail/themes/windows/mail/quickFilterBar.css
@@ -78,16 +78,23 @@
 }
 
 #qfb-boolean-mode {
   margin: 0 1px;
   padding-top: 0 !important;
   padding-bottom: 0 !important;
 }
 
+#quick-filter-bar-tab-bar > .qfb-tag-button {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+}
+
 #qfb-sticky {
   list-style-image: url("chrome://messenger/skin/icons/sticky.svg");
 }
 
 #qfb-unread {
   list-style-image: url("chrome://messenger/skin/icons/mark.svg");
 }