From fd58036eac5405576b5cb723181d42874cf50b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 5 Dec 2014 12:37:42 -0800
Subject: [PATCH] Bug 1106239 - Fix up the styling for about:home's and
 about:newtab's search panel and about:newtab's customize panel. r=felipe

---
 browser/base/content/browser.css       | 23 ++++++-------------
 browser/base/content/browser.xul       |  2 +-
 browser/base/content/newtab/newTab.css | 31 ++++++++++----------------
 browser/base/content/newtab/newTab.xul |  2 +-
 4 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index dc07b4dd2aee..24c43bb5ddab 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -1221,27 +1221,18 @@ toolbarpaletteitem[place="palette"][hidden] {
   animation-duration: 2s;
 }
 
-#abouthome-search-panel .panel-arrowcontent {
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  background: rgb(248, 250, 251);
+#abouthome-search-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
   font-size: 110%;
 }
 
-.abouthome-search-panel-item {
-  -moz-box-align: center;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  -moz-padding-start: 24px;
-  -moz-padding-end: 24px;
+#abouthome-search-panel-manage {
+  padding: 4px 24px;
 }
 
-.abouthome-search-panel-item > label {
-  -moz-padding-start: 0;
-  -moz-margin-start: 0;
-  color: rgb(130, 132, 133);
+#abouthome-search-panel-manage > label {
+  padding: 0;
+  margin: 0;
 }
 
 /* Combined context-menu items */
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 5201fd7cd4d7..0dbd35367516 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -278,7 +278,7 @@
 
     <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"
            onclick="this.hidePopup()">
-      <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item"
+      <hbox id="abouthome-search-panel-manage"
             onclick="openPreferences('paneSearch')">
         <label>&changeSearchSettings.button;</label>
       </hbox>
diff --git a/browser/base/content/newtab/newTab.css b/browser/base/content/newtab/newTab.css
index ab48914b6cdb..ba4c8376610d 100644
--- a/browser/base/content/newtab/newTab.css
+++ b/browser/base/content/newtab/newTab.css
@@ -454,27 +454,20 @@ input[type=button] {
   transition-duration: 0ms;
 }
 
-#newtab-customize-panel .panel-arrowcontent,
-#newtab-search-panel .panel-arrowcontent {
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  background: rgb(248, 250, 251);
+#newtab-customize-panel > .panel-arrowcontainer > .panel-arrowcontent,
+#newtab-search-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
 }
 
 .newtab-customize-panel-item,
-.newtab-search-panel-engine {
-  -moz-box-align: center;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  -moz-padding-start: 24px;
-  -moz-padding-end: 24px;
+.newtab-search-panel-engine,
+#newtab-search-manage {
+  padding: 4px 24px;
 }
 
 .newtab-customize-panel-item:not(:last-child),
-.newtab-search-panel-engine:not(:last-child) {
-  border-bottom: 1px solid #ccc;
+.newtab-search-panel-engine {
+  border-bottom: 1px solid threedshadow;
 }
 
 .newtab-search-panel-engine > image {
@@ -485,10 +478,10 @@ input[type=button] {
 }
 
 .newtab-customize-panel-item > label,
-.newtab-search-panel-engine > label {
-  -moz-padding-start: 0;
-  -moz-margin-start: 0;
-  color: rgb(130, 132, 133);
+.newtab-search-panel-engine > label,
+#newtab-search-manage > label {
+  padding: 0;
+  margin: 0;
 }
 
 .newtab-customize-panel-item[selected],
diff --git a/browser/base/content/newtab/newTab.xul b/browser/base/content/newtab/newTab.xul
index 7790214db55a..ebde760b1ec4 100644
--- a/browser/base/content/newtab/newTab.xul
+++ b/browser/base/content/newtab/newTab.xul
@@ -29,7 +29,7 @@
 
   <xul:panel id="newtab-search-panel" orient="vertical" type="arrow"
              noautohide="true" hidden="true">
-    <xul:hbox id="newtab-search-manage" class="newtab-search-panel-engine">
+    <xul:hbox id="newtab-search-manage">
       <xul:label>&changeSearchSettings.button;</xul:label>
     </xul:hbox>
   </xul:panel>