Bug 1627927 - Rewrite callers of chrome "redirects" chrome://messenger/skin/ to chrome://messenger/skin/messenger.css. r=pmorris

# Rewrite chrome://messenger/skin/ to chrome://messenger/skin/messenger.css
find . -type f -not -path "*.hg/*" -not -path "./suite/*" -not -path "./editor/*" -regex ".*\.\(js\|jsm\|css\|xhtml\)$" -exec sed -i -E 's#(chrome://messenger/skin/)"#\1messenger.css"#g' {} \;

common/src/customizeToolbar.xhtml

@@ -22,7 +22,7 @@
 <?xml-stylesheet href="chrome://messenger/content/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/customizeToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>

mail/base/content/glodaFacetView.css

@@ -2,7 +2,7 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 body,
 html {

mail/base/content/newInstall.xhtml

@@ -6,7 +6,7 @@
 
 <!DOCTYPE window>
 
-<?xml-stylesheet href="chrome://messenger/skin/"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/newInstall.css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

mail/components/im/content/chat-conversation.js

@@ -1281,7 +1281,7 @@
       if (image) {
         aItem.firstElementChild.setAttribute(
           "src",
-          "chrome://messenger/skin/" + image + ".png"
+          "chrome://messenger/skin/messenger.css" + image + ".png"
         );
       } else {
         aItem.firstElementChild.removeAttribute("src");

mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [

mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!--

mail/extensions/openpgp/content/ui/enigmailKeySelection.xhtml

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [

mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [

mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://openpgp/skin/enigmail.css" type="text/css"?>
 
 <!DOCTYPE window [

mail/themes/linux/mail/accountWizard.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/addrbook/abContactsPanel.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/linux/mail/addrbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-toolbox {

mail/themes/linux/mail/addrbook/cardDialog.css

@@ -6,7 +6,7 @@
   == Styles for Address Book dialogs.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 

mail/themes/linux/mail/compose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");

mail/themes/linux/mail/dialogs.css

@@ -6,7 +6,7 @@
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/junkMail.css

@@ -9,7 +9,7 @@
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/mailWindow1.css

@@ -8,7 +8,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");

mail/themes/linux/mail/messageWindow.css

@@ -6,7 +6,7 @@
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/linux/mail/msgSelectOffline.css

@@ -6,7 +6,7 @@
    == The dialog where you select which folders to enable for offline use.
    ========================================================================== */
 
-@import url("chrome://messenger/skin/");
+@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");

mail/themes/linux/mail/smime/certFetchingStatus.css

@@ -2,6 +2,6 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/linux/mail/smime/msgCompSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/smime/msgReadSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/linux/mail/subscribe.css

@@ -6,7 +6,7 @@
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/osx/mail/accountWizard.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/addrbook/abContactsPanel.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/osx/mail/addrbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #ab-bar2 {

mail/themes/osx/mail/addrbook/cardDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 

mail/themes/osx/mail/compose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");

mail/themes/osx/mail/dialogs.css

@@ -6,7 +6,7 @@
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/junkMail.css

@@ -9,7 +9,7 @@
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/mailWindow1.css

@@ -8,7 +8,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");

mail/themes/osx/mail/messageWindow.css

@@ -6,7 +6,7 @@
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/osx/mail/msgSelectOffline.css

@@ -6,7 +6,7 @@
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/smime/certFetchingStatus.css

@@ -2,6 +2,6 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/osx/mail/smime/msgCompSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/smime/msgReadSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/osx/mail/subscribe.css

@@ -6,7 +6,7 @@
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/shared/mail/accountCentral.css

@@ -2,7 +2,7 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 html {
   height: 100%;

mail/themes/shared/mail/accountManage.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://global/skin/in-content/common.css");
 @import url("chrome://messenger/skin/preferences/preferences.css");
 

mail/themes/shared/mail/newmailalert.css

@@ -7,7 +7,7 @@
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/shared/mail/searchDialog.css

@@ -2,7 +2,7 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 
 #searchTerms {

mail/themes/windows/mail/accountWizard.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/addrbook/abContactsPanel.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book sidebar panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/addressbook/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/windows/mail/addrbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/addressbook.css");
 
 #abContent {

mail/themes/windows/mail/addrbook/cardDialog.css

@@ -6,7 +6,7 @@
   == Styles for Address Book dialogs.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 

mail/themes/windows/mail/compose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/shared/messengercompose.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");

mail/themes/windows/mail/dialogs.css

@@ -6,7 +6,7 @@
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/junkMail.css

@@ -6,7 +6,7 @@
   == Styles for the junk mail dialog
  ======================================================================== */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/mailWindow1.css

@@ -6,7 +6,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");

mail/themes/windows/mail/messageWindow.css

@@ -6,7 +6,7 @@
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/windows/mail/msgSelectOffline.css

@@ -6,7 +6,7 @@
   == Styles for the Offline Use dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/smime/certFetchingStatus.css

@@ -2,6 +2,6 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

mail/themes/windows/mail/smime/msgCompSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/smime/msgReadSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mail/themes/windows/mail/subscribe.css

@@ -6,7 +6,7 @@
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

mailnews/addrbook/prefs/content/pref-directory-add.xhtml

@@ -3,7 +3,7 @@
    - 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/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 

mailnews/addrbook/prefs/content/pref-editdirectories.xhtml

@@ -3,7 +3,7 @@
    - 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/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">
 

mailnews/base/search/content/CustomHeaders.xhtml

@@ -3,7 +3,7 @@
    - 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/. -->
 #ifdef MOZ_THUNDERBIRD
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 #else
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 #endif

mailnews/extensions/newsblog/content/feed-subscriptions.xhtml

@@ -4,7 +4,7 @@
    - 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/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>

mailnews/import/content/fieldMapImport.xhtml

@@ -3,7 +3,7 @@
    - 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/. -->
 #ifdef MOZ_THUNDERBIRD
-<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 #else
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 #endif

suite/themes/classic/mac/messenger/accountManage.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/mac/messenger/addressbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");

suite/themes/classic/mac/messenger/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/mac/messenger/mailWindow1.css

@@ -6,7 +6,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 

suite/themes/classic/mac/messenger/messengercompose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/mac/messenger/searchDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/accountCentral.css

@@ -6,7 +6,7 @@
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/accountManage.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/accountWizard.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/addressbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");

suite/themes/classic/messenger/addressbook/cardDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/addressbook/selectAddressesDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Select Addresses Dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/dialogs.css

@@ -6,7 +6,7 @@
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/mailWindow1.css

@@ -6,7 +6,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 

suite/themes/classic/messenger/messageWindow.css

@@ -6,7 +6,7 @@
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/threadPaneLabels.css");
 

suite/themes/classic/messenger/messengercompose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/newmailalert.css

@@ -7,7 +7,7 @@
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/prefPanels.css

@@ -6,7 +6,7 @@
   == Styles for the Messenger preference panels.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/searchDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Search dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/smime/certFetchingStatus.css

@@ -2,6 +2,6 @@
  * 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/. */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

suite/themes/classic/messenger/smime/msgCompSecurityInfo.css

@@ -6,6 +6,6 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

suite/themes/classic/messenger/smime/msgReadSecurityInfo.css

@@ -6,7 +6,7 @@
   == Styles for the security info window when displaying received mail.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/classic/messenger/subscribe.css

@@ -6,7 +6,7 @@
   == Styles for the Subscribe dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/accountCentral.css

@@ -6,7 +6,7 @@
   == Styles for the Messenger Account Central panel.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/accountManage.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Manager.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/accountWizard.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Account Wizard.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/addressbook/addressbook.css

@@ -6,7 +6,7 @@
   == Styles for the main Address Book window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");

suite/themes/modern/messenger/addressbook/cardDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Address Book Card view.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/addressbook/selectAddressesDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Select Addresses Dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/dialogs.css

@@ -6,7 +6,7 @@
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/filterDialog.css

@@ -6,7 +6,7 @@
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/mailWindow1.css

@@ -6,7 +6,7 @@
   == Styles for the main Mail window in the default layout scheme.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 

suite/themes/modern/messenger/messageWindow.css

@@ -6,7 +6,7 @@
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/threadPaneLabels.css");
 

suite/themes/modern/messenger/messengercompose/messengercompose.css

@@ -6,7 +6,7 @@
   == Styles for the main Messenger Compose window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/newmailalert.css

@@ -7,7 +7,7 @@
   == Styles specific to the alerts dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 

suite/themes/modern/messenger/prefPanels.css

@@ -6,7 +6,7 @@
   == Styles for the Messenger preference panels.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");