Bug 967220 - Australis - include the tabstoolbar in things animating (with a margin), r=mconley

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;

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;
 }

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;
 }

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;
 }