From 22c73f6529225507a72f20b81cac98016762323c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 30 Jul 2015 10:53:06 +0200
Subject: [PATCH] Backed out changeset caa59fe73a47

---
 .../preferences/in-content/preferences.xul        |   4 ++--
 browser/themes/linux/jar.mn                       |   1 -
 browser/themes/osx/jar.mn                         |   1 -
 .../shared/incontentprefs/preferences.inc.css     |   4 ++--
 browser/themes/shared/newtab/close.png            | Bin 931 -> 0 bytes
 browser/themes/shared/newtab/newTab.inc.css       |   8 ++++----
 browser/themes/windows/jar.mn                     |   1 -
 toolkit/themes/shared/in-content/common.inc.css   |   3 ++-
 8 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 browser/themes/shared/newtab/close.png

diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul
index edad24f65f9f..57f75e6bcea5 100644
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -200,8 +200,8 @@
                 pack="end"
                 role="dialog"
                 aria-labelledby="dialogTitle">
-        <caption flex="1" align="center">
-          <label id="dialogTitle" flex="1"></label>
+        <caption class="titlebar" flex="1" align="center">
+          <label id="dialogTitle" class="title" flex="1"></label>
           <button id="dialogClose"
                   class="close-icon"
                   aria-label="&preferencesCloseButton.label;"/>
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 7ad4c8df4541..a7e3f38f4e3c 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -185,7 +185,6 @@ browser.jar:
   skin/classic/browser/feeds/subscribe.css            (feeds/subscribe.css)
   skin/classic/browser/feeds/subscribe-ui.css         (feeds/subscribe-ui.css)
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
-  skin/classic/browser/newtab/close.png               (../shared/newtab/close.png)
   skin/classic/browser/newtab/controls.svg            (../shared/newtab/controls.svg)
   skin/classic/browser/newtab/whimsycorn.png          (../shared/newtab/whimsycorn.png)
   skin/classic/browser/panic-panel/header.png         (../shared/panic-panel/header.png)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 36d53c8198df..99523ca17f0f 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -242,7 +242,6 @@ browser.jar:
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
-  skin/classic/browser/newtab/close.png                     (../shared/newtab/close.png)
   skin/classic/browser/newtab/controls.svg                  (../shared/newtab/controls.svg)
   skin/classic/browser/newtab/whimsycorn.png                (../shared/newtab/whimsycorn.png)
   skin/classic/browser/setDesktopBackground.css
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 06028ff3e487..380498ce3cf3 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -333,9 +333,9 @@ description > html|a {
   background-color: transparent !important;
   border: none;
   box-shadow: none;
+  height: 18px;
   padding: 0;
-  min-height: 0;
-  min-width: 0;
+  min-width: 18px;
 }
 
 #dialogBox > .groupbox-body {
diff --git a/browser/themes/shared/newtab/close.png b/browser/themes/shared/newtab/close.png
deleted file mode 100644
index ea6ada49e63e0df53ea3c2edcc83844de0572f03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmV;U16=%xP)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#300006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-v<#25;o7^h%5jA129QM
zK~zY`?N-lg6L}Q>d^4#{oiW><7f&{A5p#*9P4OUjQL5~rAf$yB7xuc#3Jt4<lnhaV
z5-RM)L&Sik|3P~dJgpG%DCv4zNROLH192zweV;w-WSBOcj0?i<!7seS`}uvJ_r7o5
z0AJ64d(@W-w4cpB0<a0-OoXWepnCJon?g|dYby1x{D1oJq3}fk{C4e{J2^37L<J;(
zPOs-Iy?Qksls~_C(Vd)_Fk)(S1R>Gs^_(BxzaIyH*hz!w#pSu_#pTlU;<6c#nVxJe
zEbwF^VSt2{&0=<M53yttBta6fWD>J`d$6)ufW$Y6#88zJV`GL=3RCGcmbSMMw=B>D
z9JeeiZEs^LorY2hiLo)?e+U36IZ{AM{=&iy^TNUnla#zC%Y|0fOZMAB0U(ju-9;>!
zL@b#^YIhg#bR+>X)PMHQ9gxJlZ6j`)h?^$nZTpyx0skQY4}babIkmu}yhorGR0==W
zq5%B9x(aFyYK_#+4pKWiK7X*fI+Q>l06?NqEP^7S2<A&A%$G_&-zXM+yHEhRmE~5Y
zc(*3h07L*0p+=>6w|4ux>xZELyi5A+HV)R-{G|Ql*Vf>++rC{`0i2^FG`6;UJ3slY
zEjUL<(H&4q@#(YrN6{{V^z>Q%qf&~ahHF412iSdLKriITE>dKu0Q6#<?A{Q7^Ovre
ztyXK3+J$!eG41wa)Gk`B*5>(3SInpm80XGmrd}UPV5VM&VOfzKh?^!Z2cFS@E*Fc4
zpFJDh0ns`yT0^wP6Z>B6iG8m&;6>|v)C|nLc;P4ATwh0Xef=1Suo)Q0GY=jN?n1-1
z(Xefw&v+k!kpLDl>3xbuwS2#pTe)?ZTe)>uE#I$EG!`=H{iqK7QK<kTXl`tv-|3*=
z>7co>0eHHo4jjCE35wutxeTY<h12cgZMh7J{G&SoK%Elk3;+v2d+_E-DgaXex=JbM
zGyw0eUUdN&pSky(%<I?37Fm66&K)-lLq#kylK4w&=lf=JJZy*^rPQCnfmKS;lQ|;-
zKPKt;gBVVIA*-is=*OS5c6zRhQS?dcK7s1jzrg>?`5WDUy#JFe7?S`1002ovPDHLk
FV1j4NuF(Jh

diff --git a/browser/themes/shared/newtab/newTab.inc.css b/browser/themes/shared/newtab/newTab.inc.css
index 86c744f10bd6..169c22559c90 100644
--- a/browser/themes/shared/newtab/newTab.inc.css
+++ b/browser/themes/shared/newtab/newTab.inc.css
@@ -55,16 +55,16 @@
   width: 16px;
   float: right;
   right: 0;
-  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 16, 16, 0);
+  background-image: -moz-image-rect(url(chrome://global/skin/icons/close.png), 0, 16, 16, 0);
   background-color: transparent;
 }
 
 #newtab-undo-close-button:hover {
-  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 32, 16, 16);
+  background-image: -moz-image-rect(url(chrome://global/skin/icons/close.png), 0, 32, 16, 16);
 }
 
-#newtab-undo-close-button:hover:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 48, 16, 32);
+#newtab-undo-close-button:active {
+  background-image: -moz-image-rect(url(chrome://global/skin/icons/close.png), 0, 48, 16, 32);
 }
 
 /* CUSTOMIZE */
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index 7bffc5fbf850..601300ce91e8 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -248,7 +248,6 @@ browser.jar:
         skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
         skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
 *       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-        skin/classic/browser/newtab/close.png                        (../shared/newtab/close.png)
         skin/classic/browser/newtab/controls.svg                     (../shared/newtab/controls.svg)
         skin/classic/browser/newtab/whimsycorn.png                   (../shared/newtab/whimsycorn.png)
         skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 3e35b70ce8c2..241a99fc2ce2 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -179,8 +179,9 @@ html|button {
 xul|colorpicker[type="button"],
 xul|menulist {
   -moz-appearance: none;
-  min-height: 30px;
+  height: 30px;
   color: var(--in-content-text-color);
+  line-height: 20px;
   border: 1px solid var(--in-content-box-border-color);
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;