From 511d39641bf2b5d9c84895cd729cb3c89757b973 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 22 Nov 2013 15:25:55 +0100
Subject: [PATCH] Bug 918782 - [Australis] move functional customize mode
 styles to browser/base, r=mconley

--HG--
extra : rebase_source : d0ac2b415d1c7ab1c02219e954e66d6819347baf
---
 browser/base/content/browser.css              | 78 +++++++++++++++++++
 .../customizableui/customizeMode.inc.css      | 72 -----------------
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index fad2b682ee7f..f7ea2eb37438 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -860,6 +860,84 @@ chatbox:-moz-full-screen-ancestor > .chat-titlebar {
   -moz-image-region: auto;
 }
 
+/* Customize mode */
+#tab-view-deck {
+  transition-property: padding;
+  transition-duration: 150ms;
+  transition-timing-function: ease-out;
+}
+
+#tab-view-deck[fastcustomizeanimation] {
+  transition-duration: 1ms;
+  transition-timing-function: linear;
+}
+
+#PanelUI-contents > .panel-customization-placeholder > .panel-customization-placeholder-child {
+  list-style-image: none;
+}
+
+#customization-panelHolder {
+  overflow-y: hidden;
+}
+
+#customization-panelWrapper,
+#customization-panelWrapper > .panel-arrowcontent {
+  -moz-box-flex: 1;
+}
+
+#customization-panelWrapper > .panel-arrowcontent {
+  padding: 0 !important;
+}
+
+#customization-panelHolder > #PanelUI-mainView {
+  display: flex;
+  flex-direction: column;
+  /* Hack alert - by manually setting the preferred height to 0, we convince
+     #PanelUI-mainView to shrink when the window gets smaller in customization
+     mode. Not sure why that is - might have to do with our intermingling of
+     XUL flex, and CSS3 Flexbox. */
+  height: 0;
+}
+
+#customization-panelHolder > #PanelUI-mainView > #PanelUI-contents-scroller {
+  display: flex;
+  flex: auto;
+  flex-direction: column;
+}
+
+#customization-panel-container {
+  overflow-y: auto;
+}
+
+toolbarpaletteitem[dragover] {
+  border-left-color: transparent;
+  border-right-color: transparent;
+}
+
+#customization-palette:not([hidden]) {
+  display: block;
+  overflow: auto;
+  min-height: 3em;
+}
+
+toolbarpaletteitem[place="palette"] {
+  width: 110px;
+  height: 94px;
+  overflow: hidden;
+  display: inline-block;
+}
+
+toolbarpaletteitem[place="palette"][hidden] {
+  display: none;
+}
+
+#customization-palette .toolbarpaletteitem-box {
+  -moz-box-pack: center;
+  -moz-box-flex: 1;
+  width: 110px;
+  max-width: 110px;
+}
+
 /* UI Tour */
 
 @keyframes uitour-wobble {
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index 9cf062527eeb..f02e14fc00e5 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -3,18 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Customization mode */
-
-#tab-view-deck {
-  transition-property: padding;
-  transition-duration: 150ms;
-  transition-timing-function: ease-out;
-}
-
-#tab-view-deck[fastcustomizeanimation] {
-  transition-duration: 1ms;
-  transition-timing-function: linear;
-}
-
 #nav-bar[customize-entered] > #nav-bar-customization-target {
   margin: 1px 3px;
 }
@@ -34,35 +22,6 @@
   outline-offset: -5px;
 }
 
-#PanelUI-contents > .panel-customization-placeholder > .panel-customization-placeholder-child {
-  list-style-image: none;
-}
-
-#customization-panelHolder {
-  overflow-y: hidden;
-}
-
-#customization-panelWrapper,
-#customization-panelWrapper > .panel-arrowcontent {
-  -moz-box-flex: 1;
-}
-
-#customization-panelHolder > #PanelUI-mainView {
-  display: flex;
-  flex-direction: column;
-  /* Hack alert - by manually setting the preferred height to 0, we convince
-     #PanelUI-mainView to shrink when the window gets smaller in customization
-     mode. Not sure why that is - might have to do with our intermingling of
-     XUL flex, and CSS3 Flexbox. */
-  height: 0;
-}
-
-#customization-panelHolder > #PanelUI-mainView > #PanelUI-contents-scroller {
-  display: flex;
-  flex: auto;
-  flex-direction: column;
-}
-
 #main-window[customize-entered] .customization-target {
   min-width: 100px;
   padding-left: 10px;
@@ -96,11 +55,6 @@
   background-repeat: no-repeat, no-repeat, repeat, repeat, no-repeat;
   background-size: auto 12px, 12px 100%, auto, auto, auto;
   background-attachment: scroll, scroll, fixed, fixed, scroll;
-  overflow-y: auto;
-}
-
-#customization-panelWrapper > .panel-arrowcontent {
-  padding: 0 !important;
 }
 
 toolbarpaletteitem {
@@ -146,41 +100,15 @@ toolbarpaletteitem[place="toolbar"] {
   margin-left: 0;
 }
 
-toolbarpaletteitem[dragover] {
-  border-left-color: transparent;
-  border-right-color: transparent;
-}
-
 #customization-palette:not([hidden]) {
-  display: block;
-  overflow: auto;
-  min-height: 3em;
   margin-bottom: 25px;
 }
 
-toolbarpaletteitem[place="palette"] {
-  width: 110px;
-  height: 94px;
-  overflow: hidden;
-  display: inline-block;
-}
-
-toolbarpaletteitem[place="palette"][hidden] {
-  display: none;
-}
-
 #customization-palette > #wrapper-edit-controls,
 #customization-palette > #wrapper-zoom-controls {
   width: 225px;
 }
 
-#customization-palette .toolbarpaletteitem-box {
-  -moz-box-pack: center;
-  -moz-box-flex: 1;
-  width: 110px;
-  max-width: 110px;
-}
-
 #wrapper-edit-controls[place="palette"] > .toolbarpaletteitem-box,
 #wrapper-zoom-controls[place="palette"] > .toolbarpaletteitem-box {
   width: 225px;