Bug 631509 - Don't enforce a size on add-on toolbar button icons. r=mstange a=beltzner
authorDão Gottwald <dao@mozilla.com>
Wed, 16 Feb 2011 08:38:52 +0100
changeset 62652 b4aa47ca42c1e82f8c3cde4b93ae446285ae1a37
parent 62651 a4ac9b13eab72a05d53f3964b220de30ba5cca0e
child 62653 79bbe4072e69e75c355e037c1bbfb53e64348028
push id18816
push userdgottwald@mozilla.com
push dateWed, 16 Feb 2011 07:50:13 +0000
treeherdermozilla-central@b4aa47ca42c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange, beltzner
bugs631509
milestone2.0b12pre
first release with
nightly linux32
b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files
nightly linux64
b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files
nightly mac
b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files
nightly win32
b4aa47ca42c1 / 4.0b12pre / 20110216030352 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 631509 - Don't enforce a size on add-on toolbar button icons. r=mstange a=beltzner
browser/themes/pinstripe/browser/browser.css
browser/themes/winstripe/browser/browser.css
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -340,18 +340,16 @@ toolbar:not([mode="icons"]) .toolbarbutt
 toolbar:not([mode="icons"]) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 toolbar:not([mode="icons"]) #restore-button {
   min-width: 0;
 }
 
 .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,
 .toolbarbutton-1[type="menu-button"] > .toolbarbutton-menubutton-button[disabled="true"] > .toolbarbutton-icon,
 #restore-button[disabled="true"] > .toolbarbutton-icon {
   opacity: .4;
 }
 
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -694,29 +694,18 @@ menuitem.bookmark-item {
 }
 
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-icon {
   -moz-margin-end: 0;
 }
 
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-#nav-bar .toolbarbutton-1 > .toolbarbutton-icon {
+#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon {
   margin: 1px;
-  width: 16px;
-  height: 16px;
-}
-
-/* Default icons have a built-in glow, so they are 18*18px even in small mode,
-   except for the large back icon, which is why the code below uses 'auto' rather
-   than 18px. This will pick the correct size based on the image region. */
-:-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon {
-  margin: 0 !important;
-  width: auto !important;
-  height: auto !important;
 }
 
 toolbar[mode="full"] .toolbarbutton-1,
 toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 57px;
 }
 
 :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,