From 7b16b5b5a9f2cb7beff24fbcce45b7e90cd40653 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Sat, 8 Feb 2014 00:27:59 +0000
Subject: [PATCH] Bug 967220 - Australis - include the tabstoolbar in things
 animating (with a margin), r=mconley

---
 browser/base/content/browser.css                      |  4 ++--
 browser/themes/linux/browser.css                      | 11 +++++++++--
 browser/themes/osx/browser.css                        |  3 +--
 .../shared/customizableui/customizeMode.inc.css       |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 77449560d068..b9434c1921f3 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -894,14 +894,14 @@ chatbox:-moz-full-screen-ancestor > .chat-titlebar {
 }
 
 /* Customize mode */
-#navigator-toolbox > toolbar:not(#TabsToolbar),
+#navigator-toolbox > toolbar,
 #content-deck {
   transition-property: margin-left, margin-right;
   transition-duration: 150ms;
   transition-timing-function: ease-out;
 }
 
-#tab-view-deck[fastcustomizeanimation] #navigator-toolbox > toolbar:not(#TabsToolbar),
+#tab-view-deck[fastcustomizeanimation] #navigator-toolbox > toolbar,
 #tab-view-deck[fastcustomizeanimation] #content-deck {
   transition-duration: 1ms;
   transition-timing-function: linear;
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 300460769fe1..47d5027ab0a4 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -29,7 +29,14 @@
   -moz-appearance: none;
   background-color: transparent;
   border-top: none;
-  border-bottom: 1px solid ThreeDShadow;
+}
+
+#navigator-toolbox::after {
+  content: "";
+  display: -moz-box;
+  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+  height: 1px;
+  background-color: ThreeDShadow;
 }
 
 #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) {
@@ -2008,7 +2015,7 @@ chatbox {
   border-left: 3px solid transparent;
 }
 
-#main-window[customizing] #TabsToolbar::after {
+#main-window[customizing] #navigator-toolbox::after {
   margin-left: 2em;
   margin-right: 2em;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index ee226e238c18..459abadada2b 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4185,8 +4185,7 @@ window > chatbox {
   }
 }
 
-#main-window[customizing] #navigator-toolbox::after,
-#main-window[customize-entered] #TabsToolbar::after {
+#main-window[customizing] #navigator-toolbox::after {
   margin-left: 2em;
   margin-right: 2em;
 }
diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css
index 0cb4e2ae7c83..670082f57f00 100644
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -8,7 +8,7 @@
   margin: 0 2em 2em;
 }
 
-#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox > toolbar:not(#TabsToolbar) {
+#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox > toolbar {
   margin-left: 2em;
   margin-right: 2em;
 }