Bug 1429861 - Follow-up: Remove the .toolbar-primary rule. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 14 Jan 2018 10:21:46 +0100
changeset 58043 73858a61806859269666a58fd830d145e1522425
parent 58042 1cd7416310516ff11b04225dbf0d5f07103b7697
child 58044 fcae4e56142712dda7966c17dc21eac4a1200415
push id5746
push usermozilla@jorgk.com
push dateMon, 15 Jan 2018 19:13:21 +0000
treeherdertry-comm-central@8a347085493f [default view] [failures only]
reviewersjorgk
bugs1429861
Bug 1429861 - Follow-up: Remove the .toolbar-primary rule. r=jorgk
mail/components/im/content/imconversation.xml
mail/themes/linux/mail/tabmail.css
mail/themes/shared/mail/messenger.css
--- a/mail/components/im/content/imconversation.xml
+++ b/mail/components/im/content/imconversation.xml
@@ -1694,17 +1694,17 @@
           return this._bundle;
          ]]>
        </getter>
      </property>
     </implementation>
   </binding>
 
   <binding id="conv-info-large"
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
+           extends="chrome://messenger/content/toolbar.xml#toolbar">
     <resources>
       <stylesheet src="chrome://messenger/content/chat/chat.css"/>
     </resources>
     <content>
       <xul:stack anonid="statusImageStack" class="statusImageStack">
         <!-- The box around the user icon is a workaround for bug 955673. -->
         <xul:box class="userIconHolder" xbl:inherits="userIcon">
           <xul:image anonid="userIcon" class="userIcon" mousethrough="always"
--- a/mail/themes/linux/mail/tabmail.css
+++ b/mail/themes/linux/mail/tabmail.css
@@ -13,17 +13,17 @@
 }
 
 #tabs-toolbar {
   -moz-appearance: none;
   padding: 0;
 }
 
 #tabs-toolbar:not(:-moz-lwtheme) {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
+  -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar-drag");
 }
 
 #tabpanelcontainer:-moz-lwtheme {
   color: inherit;
 }
 
 tabpanels {
   -moz-appearance: none;
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -7,20 +7,16 @@
 :root:-moz-lwtheme {
   --toolbarbutton-icon-fill-opacity: 1;
 }
 
 description.error {
   color: #FF0000;
 }
 
-.toolbar-primary {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-}
-
 toolbar[printpreview="true"] {
   -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar");
 }
 
 #tabbar-toolbar {
   -moz-appearance: none;
   padding: 0;
 }