Bug 967220 - Australis - Include the tabstoolbar in things animating (with a margin). r=mconley, a=sledru
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Sat, 08 Feb 2014 00:27:59 +0000
changeset 182768 1acebd4c891291ce99a49a3fb47b23467caa5990
parent 182767 77ba19df83b290f74d7cd40373b93213277e5095
child 182769 f676d238a96dcf3cb98b8cbd71bf13777e4ac637
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, sledru
bugs967220
milestone29.0a2
Bug 967220 - Australis - Include the tabstoolbar in things animating (with a margin). r=mconley, a=sledru
browser/base/content/browser.css
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/customizableui/customizeMode.inc.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -889,24 +889,24 @@ chatbox:-moz-full-screen-ancestor > .cha
   background: transparent;
   border: none;
   transition: opacity 300ms;
   /* The popup inherits -moz-image-region from the button, must reset it */
   -moz-image-region: auto;
 }
 
 /* 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;
 }
 
 #PanelUI-contents > .panel-customization-placeholder > .panel-customization-placeholder-child {
   list-style-image: none;
 }
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -24,17 +24,24 @@
 #main-menubar {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
 #navigator-toolbox {
   -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) {
   -moz-appearance: none;
   border-style: none;
   background-color: -moz-Dialog;
 }
 
@@ -2007,17 +2014,17 @@ chatbox {
 
 #main-window[customize-entered] #TabsToolbar {
   -moz-appearance: none;
   background-clip: padding-box;
   border-right: 3px solid transparent;
   border-left: 3px solid transparent;
 }
 
-#main-window[customizing] #TabsToolbar::after {
+#main-window[customizing] #navigator-toolbox::after {
   margin-left: 2em;
   margin-right: 2em;
 }
 
 /* End customization mode */
 
 
 #main-window[privatebrowsingmode=temporary] #TabsToolbar::before {
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4147,18 +4147,17 @@ window > chatbox {
     -moz-image-region: rect(0, 96px, 48px, 48px);
   }
 
   #customization-titlebar-visibility-button > .button-box > .button-icon {
     width: 24px;
   }
 }
 
-#main-window[customizing] #navigator-toolbox::after,
-#main-window[customize-entered] #TabsToolbar::after {
+#main-window[customizing] #navigator-toolbox::after {
   margin-left: 2em;
   margin-right: 2em;
 }
 
 /* End customization mode */
 
 #main-window[privatebrowsingmode=temporary] {
   background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Customization mode */
 
 #main-window:-moz-any([customize-entering],[customize-entered]) #content-deck {
   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;
 }
 
 #main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck {
   pointer-events: none;
 }