Backed out changeset caa59fe73a47

browser/components/preferences/in-content/preferences.xul

@@ -200,8 +200,8 @@
                 pack="end"
                 role="dialog"
                 aria-labelledby="dialogTitle">
-        <caption flex="1" align="center">
+        <caption class="titlebar" flex="1" align="center">
-          <label id="dialogTitle" flex="1"></label>
+          <label id="dialogTitle" class="title" flex="1"></label>
           <button id="dialogClose"
                   class="close-icon"
                   aria-label="&preferencesCloseButton.label;"/>

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)

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

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: 18px;
-  min-width: 0;
 }
 
 #dialogBox > .groupbox-body {

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 {
+#newtab-undo-close-button:active {
-  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 48, 16, 32);
+  background-image: -moz-image-rect(url(chrome://global/skin/icons/close.png), 0, 48, 16, 32);
 }
 
 /* CUSTOMIZE */

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)

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;