Bug 609107 - Updated toolbarbutton dropmarker. r=dao

--HG--
rename : browser/themes/winstripe/mainwindow-dropdown-arrow-aero.png => browser/themes/winstripe/searchbar-dropdown-arrow-aero.png
rename : browser/themes/winstripe/mainwindow-dropdown-arrow.png => browser/themes/winstripe/searchbar-dropdown-arrow.png

browser/themes/winstripe/browser.css

@@ -716,10 +716,6 @@ menuitem.bookmark-item {
   margin: 1px 3px;
 }
 
-@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-border-start-style: none;
-}
-
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:-moz-locale-dir(ltr),
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
   border-top-right-radius: 0;
@@ -732,6 +728,22 @@ menuitem.bookmark-item {
   border-bottom-left-radius: 0;
 }
 
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  -moz-border-start: none;
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
+@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
+  margin-top: 0;
+  -moz-margin-start: 2px;
+}
+
 @navbarLargeIcons@ .toolbarbutton-1[disabled="true"] {
   opacity: .4;
 }
@@ -2052,8 +2064,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #alltabs-button[type="menu"] {
-  list-style-image: url("chrome://browser/skin/mainwindow-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+  -moz-image-region: auto;
 }
 
 %ifdef WINSTRIPE_AERO
@@ -2061,11 +2073,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 #TabsToolbar > toolbarpaletteitem > #alltabs-button[type="menu"]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme),
 %endif
 #alltabs-button[type="menu"]:-moz-lwtheme-brighttext {
-  list-style-image: url(chrome://browser/skin/mainwindow-dropdown-arrow-inverted.png);
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
 
 #alltabs-button[type="menu"] > .toolbarbutton-icon {
-  margin: 3px 0;
+  margin: 0 2px;
 }
 
 #alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {

browser/themes/winstripe/jar.mn

@@ -24,8 +24,6 @@ browser.jar:
         skin/classic/browser/keyhole-forward-mask.svg
         skin/classic/browser/KUI-background.png
         skin/classic/browser/KUI-close.png
-        skin/classic/browser/mainwindow-dropdown-arrow.png
-        skin/classic/browser/mainwindow-dropdown-arrow-inverted.png
         skin/classic/browser/pageInfo.css
         skin/classic/browser/pageInfo.png                            (pageInfo.png)
         skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
@@ -37,7 +35,10 @@ browser.jar:
         skin/classic/browser/Secure24.png                            (Secure24.png)
         skin/classic/browser/Toolbar.png                             (Toolbar.png)
         skin/classic/browser/Toolbar-inverted.png
+        skin/classic/browser/toolbarbutton-dropdown-arrow.png
+        skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
 *       skin/classic/browser/searchbar.css                           (searchbar.css)
+        skin/classic/browser/searchbar-dropdown-arrow.png
         skin/classic/browser/section_collapsed.png
         skin/classic/browser/section_collapsed-rtl.png
         skin/classic/browser/section_expanded.png
@@ -189,8 +190,6 @@ browser.jar:
         skin/classic/aero/browser/keyhole-forward-mask.svg
         skin/classic/aero/browser/KUI-background.png
         skin/classic/aero/browser/KUI-close.png
-        skin/classic/aero/browser/mainwindow-dropdown-arrow.png      (mainwindow-dropdown-arrow-aero.png)
-        skin/classic/aero/browser/mainwindow-dropdown-arrow-inverted.png
         skin/classic/aero/browser/pageInfo.css
         skin/classic/aero/browser/pageInfo.png                       (pageInfo-aero.png)
         skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
@@ -202,7 +201,10 @@ browser.jar:
         skin/classic/aero/browser/Secure24.png                       (Secure24-aero.png)
         skin/classic/aero/browser/Toolbar.png
         skin/classic/aero/browser/Toolbar-inverted.png
+        skin/classic/aero/browser/toolbarbutton-dropdown-arrow.png
+        skin/classic/aero/browser/toolbarbutton-dropdown-arrow-inverted.png
 *       skin/classic/aero/browser/searchbar.css                      (searchbar.css)
+        skin/classic/aero/browser/searchbar-dropdown-arrow.png       (searchbar-dropdown-arrow-aero.png)
         skin/classic/aero/browser/section_collapsed.png
         skin/classic/aero/browser/section_collapsed-rtl.png
         skin/classic/aero/browser/section_expanded.png

browser/themes/winstripe/searchbar.css

@@ -39,7 +39,7 @@
 }
 
 .searchbar-dropmarker-image {
-  list-style-image: url(mainwindow-dropdown-arrow.png);
+  list-style-image: url("chrome://browser/skin/searchbar-dropdown-arrow.png");
   -moz-image-region: rect(0, 13px, 11px, 0);
 }
 

toolkit/themes/winstripe/global/toolbarbutton.css

@@ -147,10 +147,6 @@ toolbarbutton[checked="true"]:not([disabled="true"]) {
   margin-top: 1px;
 }
 
-.toolbarbutton-menu-dropmarker[disabled="true"] {
-  padding: 0 !important;
-}
-
 /* ::::: toolbarbutton menu-button ::::: */
 
 toolbarbutton[type="menu-button"] {