From 7730123bfa758232446ab0e542c89f541dc971fe Mon Sep 17 00:00:00 2001
From: "neil@parkwaycc.co.uk" <neil@parkwaycc.co.uk>
Date: Thu, 15 Nov 2007 14:08:00 -0800
Subject: [PATCH] Back out earlier patches because customisable menubars suck
 b=403634 r=gavin bl=mconnor

---
 toolkit/content/widgets/toolbar.xml | 10 ----------
 toolkit/content/xul.css             | 15 +--------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index cf04a7aa672..0db7d3b9619 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -70,11 +70,6 @@
   </binding>
   
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
-    <content>
-      <xul:hbox flex="1">
-        <children/>
-      </xul:hbox>
-    </content>
     <implementation implements="nsIAccessibleProvider">
       <property name="accessibleType" readonly="true">
         <getter>
@@ -267,11 +262,6 @@
   </binding>
 
   <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:menubar">
-    <content>
-      <xul:hbox flex="1">
-        <children/>
-      </xul:hbox>
-    </content>
     <implementation implements="nsIAccessibleProvider">
       <property name="accessibleType" readonly="true">
         <getter>
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index c7f83d78e88..a14c6f9de8e 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -37,6 +37,7 @@
    :: kinds of windows (not JUST browser windows) with toolbars
    ::::: */
 
+window[chromehidden~="menubar"] .chromeclass-menubar,
 window[chromehidden~="directories"] .chromeclass-directories,
 window[chromehidden~="status"] .chromeclass-status,
 window[chromehidden~="extrachrome"] .chromeclass-extrachrome,
@@ -256,20 +257,6 @@ toolbarpaletteitem[place="palette"] {
 
 menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
-  -moz-box-orient: vertical;
-  -moz-box-pack: end;
-}
-
-window[chromehidden~="menubar"] .chromeclass-menubar,
-menubar[hidden="true"],
-menubar[moz-collapsed="true"],
-menubar[collapsed="true"] {
-  min-height: 0% !important;
-  max-height: 0px !important;
-  display: -moz-box !important;
-  visibility: visible !important;
-  -moz-box-orient: vertical !important;
-  -moz-box-pack: end !important;
 }
 
 /********* menu ***********/