Bug 618096 - Use 16x16 for extension toolbar icons on Mac. r=dao

browser/themes/browserShared.inc

@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button

browser/themes/pinstripe/browser/browser.css

@@ -197,7 +197,6 @@ toolbarbutton.bookmark-item > menupopup {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
-  padding: 0;
 }
 
 .bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
@@ -323,12 +322,11 @@ toolbar:not([mode="icons"]) #restore-button {
   min-width: 0;
 }
 
-.toolbarbutton-1 > .toolbarbutton-icon,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#restore-button > .toolbarbutton-icon {
-  padding: 0;
-  height: 20px;
-  width: 20px;
+.toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  margin: 2px;
+  height: 16px;
+  width: 16px;
 }
 
 .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,
@@ -1762,7 +1760,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .tab-close-button > .toolbarbutton-icon {
   -moz-margin-end: 0px !important;
-  padding: 0;
 }
 
 .tab-close-button {
@@ -1849,12 +1846,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   padding: 0 1px;
 }
 
-.tabs-newtab-button > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-icon,
-:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  padding: 0;
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled="true"]):hover,
 :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1:not([type="menu-button"]):not([disabled]):not([open]):hover,

browser/themes/pinstripe/browser/places/organizer.css

@@ -111,7 +111,7 @@
 }
 
 #placesToolbar > toolbarbutton > .toolbarbutton-icon {
-  margin: 0 4px;
+  margin: 1px 4px;
 }
 
 #placesToolbar > toolbarbutton > .toolbarbutton-text {

toolkit/themes/pinstripe/global/notification.css

@@ -68,10 +68,6 @@ notification[type="critical"] .messageImage {
   display: none;
 }
 
-.messageCloseButton > .toolbarbutton-icon {
-  padding: 0;
-}
-
 .messageCloseButton:hover {
   list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
 }

toolkit/themes/pinstripe/global/toolbarbutton.css

@@ -55,10 +55,6 @@ toolbarbutton:not([disabled="true"]):active:hover {
   text-shadow: none;
 }
 
-.toolbarbutton-icon {
-  padding: 1px 0;
-}
-
 .toolbarbutton-text {
   margin: 0px;
   padding: 0px;