Bug 1246394 - Fix references to non-existent files. r=aleth a=rkent
authorRichard Marti <richard.marti@gmail.com>
Sat, 06 Feb 2016 15:41:59 +0100
changeset 26708 609a08076a73f68817810c4271755354e12b58da
parent 26707 e1989c919d60c4c0e613fb0712281a4197171863
child 26709 7d72264ce50702f410349ebeb5423b4b8c026781
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth, rkent
bugs1246394
Bug 1246394 - Fix references to non-existent files. r=aleth a=rkent
im/themes/preferences-gnomestripe/preferences.css
im/themes/preferences-winstripe/preferences.css
mail/components/compose/content/editorOverlay.xul
mail/components/im/themes/chat.css
mail/components/im/themes/imAccounts.css
mail/themes/linux/jar.mn
mail/themes/linux/mail/compose/editorOverlay.css
mail/themes/linux/mail/compose/messengercompose.css
--- a/im/themes/preferences-gnomestripe/preferences.css
+++ b/im/themes/preferences-gnomestripe/preferences.css
@@ -2,17 +2,17 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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/.
 */
 
 /* Global Styles */
 #BrowserPreferences radio[pane] {
-  list-style-image: url("chrome://instantbird/skin/preferences/Options.png"); 
+  list-style-image: url("chrome://instantbird/skin/preferences/Options.png");
 }
 
 radio[pane=paneMain] {
   -moz-image-region: rect(0px, 32px,  32px, 0px)
 }
 
 radio[pane=paneTabs] {
   -moz-image-region: rect(0px, 64px, 32px, 32px)
@@ -62,17 +62,17 @@ radio[pane=paneAdvanced] {
   width: 5em;
 }
 
 /* styles for the link elements copied from .text-link in global.css */
 .inline-link {
   color: -moz-nativehyperlinktext;
   text-decoration: underline;
 }
-  
+
 .inline-link:not(:focus) {
   outline: 1px dotted transparent;
 }
 
 /* Modeless Window Dialogs */
 .windowDialog,
 .windowDialog prefpane {
   padding: 0px;
@@ -91,31 +91,31 @@ radio[pane=paneAdvanced] {
   width: 16px;
   height: 16px;
   margin: 0px 2px;
   list-style-image: url("moz-icon://stock/gtk-file?size=menu");
 }
 
 #paneApplications {
   margin-left: 4px;
-  margin-right: 4px; 
+  margin-right: 4px;
   padding-left: 0;
-  padding-right: 0; 
+  padding-right: 0;
 }
 
 #linksOpenInBox {
   margin-top: 5px;
 }
 
 #paneAdvanced {
   padding-bottom: 10px;
 }
 #advancedPrefs {
   margin-left: 0;
-  margin-right: 0; 
+  margin-right: 0;
 }
 
 #cookiesChildren::-moz-tree-image(domainCol, container) {
   list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
 }
 
 #cookieInfoBox {
   border: 1px solid ThreeDShadow;
@@ -156,17 +156,17 @@ radio[pane=paneAdvanced] {
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 1.1em;
   -moz-padding-start: 20px;
   margin-left: 1em;
   margin-right: 1em;
 }
 #noPreviewImage {
-  list-style-image: url("chrome://global/skin/icons/information-64.png");
+  list-style-image: url("chrome://global/skin/icons/information-32.png");
   -moz-margin-end: 1.2em;
 }
 #noPreviewInnerBox {
   max-width: 25em;
 }
 #noPreviewTitle {
   margin: 0 1em 0.6em 0;
   font-size: 160%;
--- a/im/themes/preferences-winstripe/preferences.css
+++ b/im/themes/preferences-winstripe/preferences.css
@@ -2,72 +2,72 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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/.
 */
 
 /* Global Styles */
 #BrowserPreferences radio[pane] {
-  list-style-image: url("chrome://instantbird/skin/preferences/Options.png"); 
+  list-style-image: url("chrome://instantbird/skin/preferences/Options.png");
   padding: 5px 3px 1px;
 }
 
 radio[pane=paneMain] {
 	-moz-image-region: rect(0px, 32px,  32px, 0px)
 }
-radio[pane=paneMain]:hover, 
+radio[pane=paneMain]:hover,
 radio[pane=paneMain][selected="true"]  {
 	-moz-image-region: rect(32px, 32px,  64px, 0px)
 }
 
 radio[pane=paneTabs] {
 	-moz-image-region: rect(0px, 64px, 32px, 32px)
 }
-radio[pane=paneTabs]:hover, 
+radio[pane=paneTabs]:hover,
 radio[pane=paneTabs][selected="true"] {
 	-moz-image-region: rect(32px, 64px, 64px, 32px)
 }
 
 radio[pane=paneContent] {
 	-moz-image-region: rect(0px, 96px,  32px, 64px)
 }
-radio[pane=paneContent]:hover, 
+radio[pane=paneContent]:hover,
 radio[pane=paneContent][selected="true"]  {
 	-moz-image-region: rect(32px, 96px,  64px, 64px)
 }
 
 radio[pane=paneApplications] {
 	-moz-image-region: rect(0px, 128px,  32px, 96px)
 }
-radio[pane=paneApplications]:hover, 
+radio[pane=paneApplications]:hover,
 radio[pane=paneApplications][selected="true"]  {
 	-moz-image-region: rect(32px, 128px,  64px, 96px)
 }
 
 radio[pane=panePrivacy] {
 	-moz-image-region: rect(0px, 160px,  32px, 128px)
 }
-radio[pane=panePrivacy]:hover, 
+radio[pane=panePrivacy]:hover,
 radio[pane=panePrivacy][selected="true"]  {
 	-moz-image-region: rect(32px, 160px,  64px, 128px)
 }
 
 radio[pane=paneThemes] {
 	-moz-image-region: rect(0px, 192px,  32px, 160px)
 }
-radio[pane=paneThemes]:hover, 
+radio[pane=paneThemes]:hover,
 radio[pane=paneThemes][selected="true"]  {
 	-moz-image-region: rect(32px, 192px,  64px, 160px)
 }
 
 radio[pane=paneAdvanced] {
 	-moz-image-region: rect(0px, 224px, 32px, 192px)
 }
-radio[pane=paneAdvanced]:hover, 
+radio[pane=paneAdvanced]:hover,
 radio[pane=paneAdvanced][selected="true"] {
 	-moz-image-region: rect(32px, 224px, 64px, 192px)
 }
 
 /* Themes Pane */
 #BrowserPreferences[animated="true"] #smileysPreview {
   height: 25em;
 }
@@ -171,17 +171,17 @@ radio[pane=paneAdvanced][selected="true"
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 1.1em;
   -moz-padding-start: 20px;
   margin-left: 1em;
   margin-right: 1em;
 }
 #noPreviewImage {
-  list-style-image: url("chrome://global/skin/icons/information-64.png");
+  list-style-image: url("chrome://global/skin/icons/information-32.png");
   -moz-margin-end: 1.2em;
 }
 #noPreviewInnerBox {
   max-width: 25em;
 }
 #noPreviewTitle {
   margin: 0 1em 0.6em 0;
   font-size: 160%;
--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -1,14 +1,13 @@
 <?xml version="1.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/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/messengercompose/editorOverlay.css" type="text/css"?>
 <!DOCTYPE overlay [
 <!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 %editorOverlayDTD;
 <!ENTITY % utilityOverlayDTD SYSTEM
   "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityOverlayDTD;
 ]>
 
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -14,17 +14,21 @@
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 1.1em;
   -moz-padding-start: 20px;
   margin-left: 1em;
   margin-right: 1em;
 }
 .im-placeholder-image {
+%ifdef XP_MACOSX
   list-style-image: url("chrome://global/skin/icons/information-64.png");
+%else
+  list-style-image: url("chrome://global/skin/icons/information-32.png");
+%endif
   -moz-margin-end: 1.2em;
 }
 .im-placeholder-innerbox {
   max-width: 25em;
 }
 .im-placeholder-title {
   margin: 0 1em 0.6em 0;
   font-size: 160%;
--- a/mail/components/im/themes/imAccounts.css
+++ b/mail/components/im/themes/imAccounts.css
@@ -32,17 +32,21 @@ notification > hbox {
   border: 1px solid ThreeDShadow;
   border-radius: 10px;
   padding: 1.1em;
   -moz-padding-start: 20px;
   margin-left: 1em;
   margin-right: 1em;
 }
 #noAccountImage {
+%ifdef XP_MACOSX
   list-style-image: url("chrome://global/skin/icons/information-64.png");
+%else
+  list-style-image: url("chrome://global/skin/icons/information-32.png");
+%endif
   -moz-margin-end: 1.2em;
 }
 #noAccountInnerBox {
   max-width: 25em;
 }
 #noAccountTitle {
   margin: 0 1em 0.6em 0;
   font-size: 160%;
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -87,17 +87,16 @@ classic.jar:
   skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
   skin/classic/messenger/addressbook/icons/remote-addrbook-error.png      (mail/addrbook/remote-addrbook-error.png)
   skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png     (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/cloudfile/addAccountDialog.css       (mail/cloudfile/addAccountDialog.css)
   skin/classic/messenger/cloudfile/Hightail/settings.css               (mail/cloudfile/Hightail/settings.css)
   skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css       (mail/cloudfile/Hightail/fileExceedsLimit.css)
   skin/classic/messenger/cloudfile/Hightail/check.png                  (mail/cloudfile/Hightail/check.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
-  skin/classic/messenger/messengercompose/editorOverlay.css    (mail/compose/editorOverlay.css)
   skin/classic/messenger/messengercompose/compose-toolbar.svg  (../shared/mail/icons/compose-toolbar.svg)
   skin/classic/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons.png)
   skin/classic/messenger/messengercompose/linux-noise.png     (mail/compose/linux-noise.png)
   skin/classic/messenger/downloads/download.svg               (mail/downloads/download.svg)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
 % skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
   skin/classic/messenger-newsblog/feed-subscriptions.css      (mail/newsblog/feed-subscriptions.css)
   skin/classic/messenger-newsblog/icons/rss-feed.png          (mail/newsblog/rss-feed.png)
deleted file mode 100644
--- a/mail/themes/linux/mail/compose/editorOverlay.css
+++ /dev/null
@@ -1,37 +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/. */
-
-/** Stock icons for the menu items. */
-#fontFaceMenu {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
-  list-style-image: url("moz-icon://stock/gtk-select-font?size=menu");
-}
-
-#increaseIndent {
-  list-style-image: url("moz-icon://stock/gtk-indent?size=menu");
-}
-
-#decreaseIndent {
-  list-style-image: url("moz-icon://stock/gtk-unindent?size=menu");
-}
-
-#menu_styleBold {
-  list-style-image: url("moz-icon://stock/gtk-bold?size=menu");
-}
-
-#menu_styleItalic {
-  list-style-image: url("moz-icon://stock/gtk-italic?size=menu");
-}
-
-#menu_styleUnderline {
-  list-style-image: url("moz-icon://stock/gtk-underline?size=menu");
-}
-
-#menu_styleUnderline {
-  list-style-image: url("moz-icon://stock/gtk-underline?size=menu");
-}
-
-#menu_styleStrikeThru {
-  list-style-image: url("moz-icon://stock/gtk-strikethrough?size=menu");
-}
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -21,16 +21,50 @@
   min-width: 15em;
 }
 
 #compose-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
+/** Stock icons for the menu items. */
+#fontFaceMenu {
+  -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
+  list-style-image: url("moz-icon://stock/gtk-select-font?size=menu");
+}
+
+#increaseIndent {
+  list-style-image: url("moz-icon://stock/gtk-indent?size=menu");
+}
+
+#decreaseIndent {
+  list-style-image: url("moz-icon://stock/gtk-unindent?size=menu");
+}
+
+#menu_styleBold {
+  list-style-image: url("moz-icon://stock/gtk-bold?size=menu");
+}
+
+#menu_styleItalic {
+  list-style-image: url("moz-icon://stock/gtk-italic?size=menu");
+}
+
+#menu_styleUnderline {
+  list-style-image: url("moz-icon://stock/gtk-underline?size=menu");
+}
+
+#menu_styleUnderline {
+  list-style-image: url("moz-icon://stock/gtk-underline?size=menu");
+}
+
+#menu_styleStrikeThru {
+  list-style-image: url("moz-icon://stock/gtk-strikethrough?size=menu");
+}
+
 /* ::::: primary toolbar buttons ::::: */
 
 #button-send {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#send");
 }
 
 #button-contacts {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.svg#contacts");