Bug 990533: use correct toolbar icon for the Home button when placed on the Bookmarks toolbar. r=mak, a=sledru.
authorMike de Boer <mdeboer@mozilla.com>
Thu, 10 Apr 2014 10:41:43 -0400
changeset 183695 2948b8b5d51d
parent 183694 9c70e4856b3f
child 183696 32d5b6ea4a64
push id3450
push usermconley@mozilla.com
push date2014-04-10 14:45 +0000
treeherdermozilla-beta@f5622633b23f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak, sledru
bugs990533
milestone29.0
Bug 990533: use correct toolbar icon for the Home button when placed on the Bookmarks toolbar. r=mak, a=sledru.
browser/themes/osx/browser.css
browser/themes/osx/home.png
browser/themes/osx/jar.mn
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -224,17 +224,17 @@ toolbarbutton.bookmark-item:not(.subview
   background-color: rgba(0, 0, 0, .5);
 }
 
 toolbarbutton.bookmark-item > menupopup {
   margin-top: 2px;
   -moz-margin-start: 3px;
 }
 
-.bookmark-item > .toolbarbutton-icon,
+.bookmark-item:not(#home-button) > .toolbarbutton-icon,
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
   width: 16px;
   min-height: 16px;
   max-height: 16px;
 }
 
 .bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
 .bookmark-item > .toolbarbutton-icon[type="menu"],
@@ -1485,22 +1485,20 @@ toolbarbutton[sdk-button="true"][cui-are
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
 /* home button */
 
 #home-button.bookmark-item {
-  list-style-image: url("chrome://browser/skin/home.png");
-  -moz-image-region: rect(0, 12px, 12px, 0);
-}
-
-#home-button.bookmark-item:hover {
-  -moz-image-region: rect(0, 24px, 12px, 12px);
+  /* We need to use !important here, because other selectors that apply padding
+     are more specific. */
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
 }
 
 #home-button.bookmark-item > .toolbarbutton-icon {
   display: -moz-box !important;
   -moz-margin-start: -2px;
   -moz-margin-end: 3px;
 }
 
@@ -2602,22 +2600,22 @@ sidebarheader > .tabs-closebutton > .too
   color: -moz-DialogText;
   text-shadow: none;
 }
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-.bookmark-item {
+.bookmark-item:not(#home-button) {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 @media (min-resolution: 2dppx) {
-  .bookmark-item {
+  .bookmark-item:not(#home-button) {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
   }
 
   image.bookmark-item {
     width: 16px;
   }
 }
 
deleted file mode 100644
index 04ae4ae965dbb61f89491ba7dedd787b8241188e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -24,17 +24,16 @@ browser.jar:
 * skin/classic/browser/browser-lightweightTheme.css
   skin/classic/browser/click-to-play-warning-stripes.png
 * skin/classic/browser/engineManager.css                    (engineManager.css)
   skin/classic/browser/fullscreen-darknoise.png
   skin/classic/browser/Geolocation-16.png
   skin/classic/browser/Geolocation-16@2x.png
   skin/classic/browser/Geolocation-64.png
   skin/classic/browser/Geolocation-64@2x.png
-  skin/classic/browser/home.png
   skin/classic/browser/identity.png
   skin/classic/browser/identity@2x.png
   skin/classic/browser/identity-icons-generic.png
   skin/classic/browser/identity-icons-generic@2x.png
   skin/classic/browser/identity-icons-https.png
   skin/classic/browser/identity-icons-https@2x.png
   skin/classic/browser/identity-icons-https-ev.png
   skin/classic/browser/identity-icons-https-ev@2x.png