From 2edda04fc096c8f102d962695ef04224be452e3f Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 30 Sep 2013 13:41:27 +0200
Subject: [PATCH] Bug 896687 - remove PanelUI-mainView-spring, r=Unfocused

---
 .../components/customizableui/content/panelUI.inc.xul    | 2 --
 .../themes/shared/customizableui/customizeMode.inc.css   | 4 ----
 .../themes/shared/customizableui/panelUIOverlay.inc.css  | 9 +--------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 91586b90914a..f197ae62a880 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -15,8 +15,6 @@
         <vbox id="PanelUI-contents"/>
       </vbox>
 
-      <vbox id="PanelUI-mainView-spring"/>
-
       <footer id="PanelUI-footer">
         <!-- The parentNode is used so that the footer is presented as the anchor
              instead of just the button being the anchor. -->
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index 896a08dd201d..8f753d562a23 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -63,10 +63,6 @@
   flex-direction: column;
 }
 
-#customization-panelHolder > #PanelUI-mainView > #PanelUI-mainView-spring {
-  display: none;
-}
-
 #main-window[customizing] .customization-target {
   min-width: 100px;
   padding-left: 10px;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 919f985525ce..54f23cfc720a 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -27,19 +27,11 @@
   -moz-box-flex: 1;
 }
 
-#PanelUI-mainView-spring {
-  flex: auto;
-}
-
 #PanelUI-mainView {
   display: flex;
   flex-direction: column;
 }
 
-.panel-viewstack[viewtype="main"] > .panel-mainview > #PanelUI-mainView > #PanelUI-mainView-spring {
-  display: none;
-}
-
 #app-extension-point-end > #PanelUI-menu-button {
   padding: 2px 5px;
 }
@@ -106,6 +98,7 @@ panelview:not([mainview]) .toolbarbutton-text,
   width: @menuPanelWidth@;
   padding-left: 5px;
   padding-right: 5px;
+  flex: auto;
 }
 
 #edit-controls@inAnyPanel@ > toolbarbutton > .toolbarbutton-icon,