Bug 1474087 - Remove <resources> from imconversation.xml and imtooltip.xml. r=florian
authorRichard Marti <richard.marti@gmail.com>
Sat, 07 Jul 2018 22:48:30 +0200
changeset 24236 9f7c2f60e3ef312d4f57b42acba4b3b25e7b5a09
parent 24235 5205ff465bd3cdc64681e39728281bc4d3fb09d5
child 24237 c5a01cf1f72d0dbf08e74eb4ad3d533214db76a1
push id14603
push usermozilla@jorgk.com
push dateMon, 09 Jul 2018 22:03:25 +0000
treeherdercomm-central@9f7c2f60e3ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1474087
Bug 1474087 - Remove <resources> from imconversation.xml and imtooltip.xml. r=florian
chat/content/imtooltip.css
chat/content/imtooltip.xml
chat/content/jar.mn
chat/themes/imtooltip.css
mail/base/content/messenger.xul
mail/components/im/content/imconversation.xml
mail/components/im/themes/chat.css
deleted file mode 100644
--- a/chat/content/imtooltip.css
+++ /dev/null
@@ -1,8 +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/. */
-
-.userIcon:not([src]),
-.statusTypeIcon:not([status]) {
-  display: none;
-}
--- a/chat/content/imtooltip.xml
+++ b/chat/content/imtooltip.xml
@@ -6,20 +6,16 @@
 <!DOCTYPE bindings>
 
 <bindings id="imTooltipBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="tooltip" extends="chrome://global/content/bindings/popup.xml#tooltip">
-    <resources>
-      <stylesheet src="chrome://chat/content/imtooltip.css"/>
-      <stylesheet src="chrome://chat/skin/imtooltip.css"/>
-    </resources>
     <content noautohide="true" orient="vertical">
       <children>
         <xul:label class="tooltip-label" xbl:inherits="xbl:text=label" flex="1"/>
       </children>
       <xul:vbox id="largeTooltip">
         <xul:hbox align="start" crop="end" flex="1">
           <xul:vbox flex="1">
             <xul:stack>
--- a/chat/content/jar.mn
+++ b/chat/content/jar.mn
@@ -4,12 +4,11 @@
 
 chat.jar:
 % content chat %content/chat/
 	content/chat/accounts.css
 *	content/chat/account.xml
 	content/chat/browserRequest.js
 	content/chat/browserRequest.xul
 	content/chat/imAccountOptionsHelper.js
-	content/chat/imtooltip.css
 *	content/chat/imtooltip.xml
 	content/chat/convbrowser.xml
 	content/chat/conv.html
--- a/chat/themes/imtooltip.css
+++ b/chat/themes/imtooltip.css
@@ -81,11 +81,12 @@
   max-height: 48px;
   min-width: 48px;
   min-height: 48px;
   width: 48px;
   height: 48px;
 }
 
 .userIcon:not([src]),
+.statusTypeIcon:not([status]),
 .userIconHolder:not([userIcon]) {
   display: none;
 }
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -9,16 +9,17 @@
 <?xml-stylesheet href="chrome://gloda/content/glodacomplete.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/tabmail.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/tabmail.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/quickFilterBar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/editContactPanel.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/chat/chat.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
+<?xml-stylesheet href="chrome://chat/skin/imtooltip.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
 
--- a/mail/components/im/content/imconversation.xml
+++ b/mail/components/im/content/imconversation.xml
@@ -1680,19 +1680,16 @@
          ]]>
        </getter>
      </property>
     </implementation>
   </binding>
 
   <binding id="conv-info-large"
            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"
                      xbl:inherits="src=userIcon"/>
         </xul:box>
         <xul:image anonid="statusTypeIcon" class="statusTypeIcon"
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -237,16 +237,17 @@ imcontact[aliasing] .contactDisplayName 
   min-height: 60px;
 }
 
 .conv-top-info {
   margin: 0 0;
   padding: 0 0;
   border-style: none;
   -moz-appearance: none;
+  -moz-window-dragging: no-drag;
 %ifdef XP_MACOSX
   /* Copy of .main-header-area from osx/mail/messageHeader.css */
   color: #2E3436; /* Aluminium 6 */
   border-bottom:1px solid #BFBFBF !important;
   padding: 0.6ex;
 %else
   background-color: -moz-Dialog;
 %ifdef XP_WIN