From 5cb3a6b2e893a2e7699af2770d97551de8b82a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 11 Jun 2009 01:10:42 +0200
Subject: [PATCH] Bug 488543 - remove Mac-specific tabs-closebutton-box.
 r=rflint

---
 browser/base/content/tabbrowser.xml          | 10 ----------
 browser/themes/pinstripe/browser/browser.css | 12 +++---------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 42fe5ee36ce1..800990ed5317 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2896,14 +2896,8 @@
                                tooltiptext="&listAllTabs.label;"
                                oncommand="ctrlTab.open(true);"/>
           </xul:stack>
-#ifdef XP_MACOSX
-          <xul:hbox anonid="tabstrip-closebutton" class="tabs-closebutton-box" align="center" pack="end" chromedir="&locale.dir;">
-#endif
           <xul:toolbarbutton anonid="tabs-closebutton"
                              class="close-button tabs-closebutton" chromedir="&locale.dir;"/>
-#ifdef XP_MACOSX
-          </xul:hbox>
-#endif
         </xul:hbox>
       </xul:stack>
     </content>
@@ -2964,11 +2958,7 @@
       </field>
 
       <field name="mTabstripClosebutton">
-#ifdef XP_MACOSX
-        document.getAnonymousElementByAttribute(this, "anonid", "tabstrip-closebutton");
-#else
         document.getAnonymousElementByAttribute(this, "anonid", "tabs-closebutton");
-#endif
       </field>
 
       <field name="_prefObserver">({
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 6931e4bedd8d..8201ee431bff 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1763,19 +1763,13 @@ tabbrowser > tabbox > tabpanels {
 }
 
 .tabs-closebutton {
-  padding-right: 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
-  list-style-image: none;
+  -moz-padding-end: 4px;
+  list-style-image: url("chrome://global/skin/icons/closetab.png");
   border: none;
-  -moz-box-align: stretch;
-}
-
-.tabs-closebutton:hover > .toolbarbutton-icon {
-	background-image: none !important;
 }
 
 .tabs-closebutton:hover:active {
-	list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
 }
 
 tabpanels.plain {