From 0103e93e76beb1aa318901a681cca0dd0ef58095 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Mon, 21 Oct 2013 14:25:02 +0200
Subject: [PATCH] Bug 891822 - part 0: fix alltabs-button styling, r=MattN

---
 browser/themes/osx/browser.css     | 22 +++++++++++-----------
 browser/themes/shared/browser.inc  |  2 +-
 browser/themes/windows/browser.css |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index c78d2b676526..dffedb660fc3 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2827,44 +2827,44 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   }
 }
 
-#TabsToolbar #alltabs-button {
+#alltabs-button {
   list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png);
   -moz-image-region: rect(0, 17px, 20px, 0);
 }
 
-#TabsToolbar #alltabs-button:-moz-lwtheme-brighttext {
+#alltabs-button:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted.png);
 }
 
-#TabsToolbar > #alltabs-button:not([disabled="true"]):hover {
+#alltabs-button:not([disabled="true"]):hover {
   -moz-image-region: rect(0, 34px, 20px, 17px);
 }
 
-#TabsToolbar > #alltabs-button[open="true"]:not([disabled="true"]),
-#TabsToolbar > #alltabs-button:not([disabled="true"]):hover:active {
+#alltabs-button[open="true"]:not([disabled="true"]),
+#alltabs-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(0, 51px, 20px, 34px);
 }
 
 @media (min-resolution: 2dppx) {
-  #TabsToolbar #alltabs-button {
+  #alltabs-button {
     list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon@2x.png);
     -moz-image-region: rect(0, 34px, 40px, 0);
   }
 
-  #TabsToolbar #alltabs-button:-moz-lwtheme-brighttext {
+  #alltabs-button:-moz-lwtheme-brighttext {
     list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png);
   }
 
-  #TabsToolbar > #alltabs-button:not([disabled="true"]):hover {
+  #alltabs-button:not([disabled="true"]):hover {
     -moz-image-region: rect(0, 68px, 40px, 34px);
   }
 
-  #TabsToolbar > #alltabs-button[open="true"]:not([disabled="true"]),
-  #TabsToolbar > #alltabs-button:not([disabled="true"]):hover:active {
+  #alltabs-button[open="true"]:not([disabled="true"]),
+  #alltabs-button:not([disabled="true"]):hover:active {
     -moz-image-region: rect(0, 102px, 40px, 68px);
   }
 
-  #TabsToolbar #alltabs-button > .toolbarbutton-icon {
+  #alltabs-button > .toolbarbutton-icon {
     width: 17px;
   }
 }
diff --git a/browser/themes/shared/browser.inc b/browser/themes/shared/browser.inc
index 7f5357d36640..429ae613c86e 100644
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -1,4 +1,4 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button
+%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button
 %define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 9c4d39c6fe24..5bd7d558df5d 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1495,7 +1495,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
     list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
   }
 
-  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #alltabs-button {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #alltabs-button {
     list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
   }