From 405f7632959c570025d8969bd155d8ee40d5d2ae Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 25 Aug 2006 19:06:31 +0000
Subject: [PATCH] Bug 350183 - [regression] Back / Forward icons not vertically
 aligned anymore; too high. r+a=mconnor.

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@208439 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/themes/pinstripe/browser/browser.css | 5 +++++
 mozilla/browser/themes/pinstripe/browser/browser.xml | 2 +-
 mozilla/browser/themes/winstripe/browser/browser.css | 5 +++++
 mozilla/browser/themes/winstripe/browser/browser.xml | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css
index ae3c9c71661..48d42f4795b 100755
--- a/mozilla/browser/themes/pinstripe/browser/browser.css
+++ b/mozilla/browser/themes/pinstripe/browser/browser.css
@@ -276,6 +276,11 @@ toolbar:not([mode="text"]) #forward-button .toolbarbutton-menubutton-dropmarker
   margin-top: 1px;
 }
 
+toolbar[mode="icons"] #back-button .toolbarbutton-text-box,
+toolbar[mode="icons"] #forward-button .toolbarbutton-text-box {
+  display: none;
+}
+
 /* ----- DEFAULT PRIMARY TOOLBAR BUTTONS ----- */	
 
 /* ----- DEFAULT BACK BUTTON ----- */	
diff --git a/mozilla/browser/themes/pinstripe/browser/browser.xml b/mozilla/browser/themes/pinstripe/browser/browser.xml
index d2182247553..c49cbb7cb89 100644
--- a/mozilla/browser/themes/pinstripe/browser/browser.xml
+++ b/mozilla/browser/themes/pinstripe/browser/browser.xml
@@ -33,7 +33,7 @@
                           class="toolbarbutton-menubutton-dropmarker"
                           xbl:inherits="align,dir,pack,orient,disabled,toolbarmode,buttonstyle,label"/>
         </xul:hbox>
-        <xul:hbox flex="1" class="allowevents-box">
+        <xul:hbox flex="1" class="toolbarbutton-text-box allowevents-box">
            <xul:label class="toolbarbutton-text"
                       crop="right"
                       xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"
diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css
index 1f9a6b14e77..724f3e8ed5d 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.css
+++ b/mozilla/browser/themes/winstripe/browser/browser.css
@@ -314,6 +314,11 @@ toolbar:not([mode="text"]) #forward-button .toolbarbutton-menubutton-button {
   min-width: 0;
 }
 
+toolbar[mode="icons"] #back-button .toolbarbutton-text-box,
+toolbar[mode="icons"] #forward-button .toolbarbutton-text-box {
+  display: none;
+}
+
 /* ::::: 24px primary toolbar buttons ::::: */
 
 /* back button-- */
diff --git a/mozilla/browser/themes/winstripe/browser/browser.xml b/mozilla/browser/themes/winstripe/browser/browser.xml
index 6a127deec96..e14c6e047ec 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.xml
+++ b/mozilla/browser/themes/winstripe/browser/browser.xml
@@ -41,7 +41,9 @@
                            class="toolbarbutton-menubutton-dropmarker"
                            xbl:inherits="align,dir,pack,orient,disabled,toolbarmode,buttonstyle,label"/>
         </xul:hbox>
-        <xul:hbox flex="1" class="allowevents-box" align="center">
+        <xul:hbox flex="1"
+                  class="toolbarbutton-text-box allowevents-box"
+                  align="center">
            <xul:label class="toolbarbutton-text"
                       crop="right"
                       xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"