From 00804df54da9b8f1f619c0f209abac4ee667d0f6 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Sun, 17 Jul 2016 12:39:33 +0200
Subject: [PATCH] Bug 1273438 - Add chrome://messenger/skin/messenger.css to
 preferences.xul. r=aceman, jorgk

---
 mail/components/preferences/preferences.xul              | 1 +
 mail/themes/linux/mail/preferences/aboutPreferences.css  | 4 ++++
 mail/themes/linux/mail/preferences/preferences.css       | 9 +++++++++
 mail/themes/osx/mail/preferences/aboutPreferences.css    | 5 +++++
 .../shared/mail/incontentprefs/aboutPreferences.css      | 6 ++++++
 mail/themes/windows/mail/preferences/preferences.css     | 7 +++++++
 6 files changed, 32 insertions(+)

diff --git a/mail/components/preferences/preferences.xul b/mail/components/preferences/preferences.xul
index bfd4ee1a94..74a0428bc9 100644
--- a/mail/components/preferences/preferences.xul
+++ b/mail/components/preferences/preferences.xul
@@ -8,6 +8,7 @@
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://messenger/content/messenger.css"?>
+<?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 
 <!-- XXX This should be in applications.xul, but bug 393953 means putting it
    - there causes the Applications pane not to work the first time you open
diff --git a/mail/themes/linux/mail/preferences/aboutPreferences.css b/mail/themes/linux/mail/preferences/aboutPreferences.css
index 5eb0797a1b..932606c38d 100644
--- a/mail/themes/linux/mail/preferences/aboutPreferences.css
+++ b/mail/themes/linux/mail/preferences/aboutPreferences.css
@@ -54,3 +54,7 @@ filefield + button {
 #dialogTitle {
   font-size: 1.05em;
 }
+
+#defaultWebSearchPopup > menuitem > .menu-iconic-left {
+  margin-inline-start: 5px !important;
+}
diff --git a/mail/themes/linux/mail/preferences/preferences.css b/mail/themes/linux/mail/preferences/preferences.css
index 7288a87fd2..b6895fa8ce 100644
--- a/mail/themes/linux/mail/preferences/preferences.css
+++ b/mail/themes/linux/mail/preferences/preferences.css
@@ -32,6 +32,15 @@ radio[pane=paneAdvanced] {
   list-style-image: url("chrome://messenger/skin/preferences/advanced.png");
 }
 
+menulist > .menulist-label-box > .menulist-icon[src] {
+  margin-inline-start: 5px;
+  margin-inline-end: 5px;
+}
+
+menulist > menupopup > menuitem > .menu-iconic-left {
+  margin-inline-end: 5px !important;
+}
+
 /* Attachments Pane */
 #MailPreferences[animated="true"] #handlersView {
   height: 25em;
diff --git a/mail/themes/osx/mail/preferences/aboutPreferences.css b/mail/themes/osx/mail/preferences/aboutPreferences.css
index 46a0709f98..470d4e7e30 100644
--- a/mail/themes/osx/mail/preferences/aboutPreferences.css
+++ b/mail/themes/osx/mail/preferences/aboutPreferences.css
@@ -75,3 +75,8 @@ filefield + button {
 #CookiesDialog > hbox > .actionButtons {
   padding-bottom: 10px;
 }
+
+#defaultWebSearchPopup > menuitem > .menu-iconic-left {
+  margin-inline-start: 5px;
+  margin-inline-end: 3px;
+}
diff --git a/mail/themes/shared/mail/incontentprefs/aboutPreferences.css b/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
index 5da56d1f17..e1ba8562a1 100644
--- a/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
+++ b/mail/themes/shared/mail/incontentprefs/aboutPreferences.css
@@ -45,6 +45,12 @@ caption > label {
   line-height: 22px;
 }
 
+/* Web search menulist */
+#defaultWebSearch > .menulist-label-box > .menulist-icon[src] {
+  margin-inline-start: 5px;
+  margin-inline-end: 8px;
+}
+
 /* Category List */
 
 .paneSelector {
diff --git a/mail/themes/windows/mail/preferences/preferences.css b/mail/themes/windows/mail/preferences/preferences.css
index 9336947c38..b30ba3560f 100644
--- a/mail/themes/windows/mail/preferences/preferences.css
+++ b/mail/themes/windows/mail/preferences/preferences.css
@@ -44,6 +44,13 @@
     padding-top: 5px;
     min-width: 80px;
   }
+
+  @media (-moz-windows-default-theme) {
+    menulist > .menulist-label-box > .menulist-icon[src] {
+      margin-inline-start: 7px;
+      margin-inline-end: 10px;
+    }
+  }
 }
 
 @media (-moz-os-version: windows-xp) {