From 876445cc31ab9c7d4b982dd77db8f6d7db35a067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 20 Nov 2008 11:06:18 +0100
Subject: [PATCH] Backed out changeset 2686d82a880c

---
 browser/base/content/browser.xul                    |  3 +++
 toolkit/content/editMenuOverlay.xul                 |  2 ++
 toolkit/themes/gnomestripe/global/toolbar.css       | 13 +++++++++++++
 toolkit/themes/gnomestripe/global/toolbarbutton.css | 13 -------------
 toolkit/themes/pinstripe/global/toolbar.css         |  8 ++++++++
 toolkit/themes/pinstripe/global/toolbarbutton.css   |  7 -------
 toolkit/themes/winstripe/global/toolbar.css         | 13 +++++++++++++
 toolkit/themes/winstripe/global/toolbarbutton.css   | 13 -------------
 8 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7131ab4c1c69..8a01e78d0977 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -47,8 +47,11 @@
 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
+<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
+
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
diff --git a/toolkit/content/editMenuOverlay.xul b/toolkit/content/editMenuOverlay.xul
index 2de3ee716d30..6b4c1423d5e1 100644
--- a/toolkit/content/editMenuOverlay.xul
+++ b/toolkit/content/editMenuOverlay.xul
@@ -1,4 +1,6 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+
 <!DOCTYPE overlay SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 
 <overlay id="editMenuOverlay"
diff --git a/toolkit/themes/gnomestripe/global/toolbar.css b/toolkit/themes/gnomestripe/global/toolbar.css
index 8402ce97404d..7777f7e6ead3 100644
--- a/toolkit/themes/gnomestripe/global/toolbar.css
+++ b/toolkit/themes/gnomestripe/global/toolbar.css
@@ -82,6 +82,19 @@ toolbarspacer {
   width: 15px;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbarpaletteitem ::::: */
 
 toolbarpaletteitem {
diff --git a/toolkit/themes/gnomestripe/global/toolbarbutton.css b/toolkit/themes/gnomestripe/global/toolbarbutton.css
index 902686052f4f..d80bc885c06c 100644
--- a/toolkit/themes/gnomestripe/global/toolbarbutton.css
+++ b/toolkit/themes/gnomestripe/global/toolbarbutton.css
@@ -162,16 +162,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   list-style-image: none;
   -moz-image-region: auto;
 }
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
diff --git a/toolkit/themes/pinstripe/global/toolbar.css b/toolkit/themes/pinstripe/global/toolbar.css
index b15bdccc4c17..141118c1a799 100644
--- a/toolkit/themes/pinstripe/global/toolbar.css
+++ b/toolkit/themes/pinstripe/global/toolbar.css
@@ -69,6 +69,14 @@ menubar {
  min-width: 1px;
 }  
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {
diff --git a/toolkit/themes/pinstripe/global/toolbarbutton.css b/toolkit/themes/pinstripe/global/toolbarbutton.css
index efa742d49ed7..e0298b3d4677 100644
--- a/toolkit/themes/pinstripe/global/toolbarbutton.css
+++ b/toolkit/themes/pinstripe/global/toolbarbutton.css
@@ -155,10 +155,3 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
diff --git a/toolkit/themes/winstripe/global/toolbar.css b/toolkit/themes/winstripe/global/toolbar.css
index 4a64733dd29d..e1ebe0e1414f 100644
--- a/toolkit/themes/winstripe/global/toolbar.css
+++ b/toolkit/themes/winstripe/global/toolbar.css
@@ -70,6 +70,19 @@ toolbar:first-child, menubar {
   border-top: 0px !important;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {
diff --git a/toolkit/themes/winstripe/global/toolbarbutton.css b/toolkit/themes/winstripe/global/toolbarbutton.css
index 462713c84bf0..3a9ce682024c 100644
--- a/toolkit/themes/winstripe/global/toolbarbutton.css
+++ b/toolkit/themes/winstripe/global/toolbarbutton.css
@@ -173,16 +173,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   padding: 3px !important;
 }
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}