Bug 1070768 - Move XPFE's autocomplete.css to communicator so it doesn't conflict with toolkit's new global autocomplete.css. r=Ratty, a=lmandel
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 23 Oct 2014 08:34:12 +0100
changeset 225804 78b9d7be1770
parent 225803 d1de09f2d1b0
child 225805 2c49dc84f1a0
push id4022
push userryanvm@gmail.com
push date2014-10-24 13:16 +0000
treeherdermozilla-beta@78b9d7be1770 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, lmandel
bugs1070768
milestone34.0
Bug 1070768 - Move XPFE's autocomplete.css to communicator so it doesn't conflict with toolkit's new global autocomplete.css. r=Ratty, a=lmandel
xpfe/components/autocomplete/jar.mn
xpfe/components/autocomplete/resources/content/autocomplete.xml
--- a/xpfe/components/autocomplete/jar.mn
+++ b/xpfe/components/autocomplete/jar.mn
@@ -1,7 +1,9 @@
 # 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/.
 
 toolkit.jar:
     content/global/autocomplete.xml                             (resources/content/autocomplete.xml)
-    content/global/autocomplete.css                             (resources/content/autocomplete.css)
+
+comm.jar:
+    content/communicator/autocomplete.css                       (resources/content/autocomplete.css)
--- a/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -8,17 +8,17 @@
           xmlns="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="autocomplete" role="xul:combobox"
            extends="chrome://global/content/bindings/textbox.xml#textbox">
     <resources>
-      <stylesheet src="chrome://global/content/autocomplete.css"/>
+      <stylesheet src="chrome://communicator/content/autocomplete.css"/>
       <stylesheet src="chrome://global/skin/autocomplete.css"/>
     </resources>
 
     <content>
       <children includes="menupopup"/>
 
       <xul:hbox class="autocomplete-textbox-container" flex="1" align="center">
         <children includes="image|deck|stack|box">