Bug 976489 - Move the customize mode transition to the #navigator-toolbox. r=mconley
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Tue, 25 Feb 2014 23:07:02 -0800
changeset 170994 434a7a69d46f96dacbbfe1654b4c081648587661
parent 170993 11b0efa84735b693ee806405cd3f20a4df25cd05
child 170995 aa09dfcfce31b3f1537d172588ac1cd7db0223bc
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmconley
bugs976489
milestone30.0a1
Bug 976489 - Move the customize mode transition to the #navigator-toolbox. r=mconley
browser/base/content/browser.css
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/customizableui/customizeMode.inc.css
browser/themes/windows/browser.css
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -885,24 +885,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,
+#navigator-toolbox,
 #content-deck {
   transition-property: margin-left, margin-right;
   transition-duration: 150ms;
   transition-timing-function: ease-out;
 }
 
-#tab-view-deck[fastcustomizeanimation] #navigator-toolbox > toolbar,
+#tab-view-deck[fastcustomizeanimation] #navigator-toolbox,
 #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
@@ -2026,21 +2026,16 @@ 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] #navigator-toolbox::after {
-  margin-left: 2em;
-  margin-right: 2em;
-}
-
 /* End customization mode */
 
 
 #main-window[privatebrowsingmode=temporary] #TabsToolbar::before {
   display: -moz-box;
   content: "";
   background: url("chrome://browser/skin/privatebrowsing-mask.png") center no-repeat;
   width: 40px;
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -4171,21 +4171,16 @@ 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 {
-  margin-left: 2em;
-  margin-right: 2em;
-}
-
 /* End customization mode */
 
 #main-window[privatebrowsingmode=temporary] {
   background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
   background-position: top right;
   background-repeat: no-repeat;
   background-color: -moz-mac-chrome-active;
 }
--- 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 {
+#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox {
   margin-left: 2em;
   margin-right: 2em;
 }
 
 #main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck {
   pointer-events: none;
 }
 
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2497,21 +2497,16 @@ chatbox {
 }
 
 #customization-container {
   border-left: 1px solid @toolbarShadowColor@;
   border-right: 1px solid @toolbarShadowColor@;
   background-clip: padding-box;
 }
 
-#main-window[customizing] #navigator-toolbox::after {
-  margin-left: 2em;
-  margin-right: 2em;
-}
-
 /* End customization mode */
 
 #main-window[privatebrowsingmode=temporary] #private-browsing-indicator {
   width: 40px;
   background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center;
 }
 
 %include ../shared/UITour.inc.css