Bug 993265: preserve bookmark folder icons on the Bookmarks toolbar. r=mak, a=sledru.
authorMike de Boer <mdeboer@mozilla.com>
Thu, 10 Apr 2014 10:41:50 -0400
changeset 183696 32d5b6ea4a64
parent 183695 2948b8b5d51d
child 183697 f5622633b23f
push id3450
push usermconley@mozilla.com
push date2014-04-10 14:45 +0000
Treeherderresults
reviewersmak, sledru
bugs993265
milestone29.0
Bug 993265: preserve bookmark folder icons on the Bookmarks toolbar. r=mak, a=sledru.
browser/themes/osx/browser.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -586,16 +586,24 @@ toolbar .toolbarbutton-1 > .toolbarbutto
   -moz-margin-start: 9px;
   -moz-margin-end: 7px;
 }
 
 @media not all and (min-resolution: 2dppx) {
 %include ../shared/toolbarbuttons.inc.css
 %include ../shared/menupanel.inc.css
 
+  #home-button.bookmark-item {
+    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  }
+
+  #home-button.bookmark-item:not(@inAnyPanel@):-moz-lwtheme-brighttext {
+    list-style-image: url(chrome://browser/skin/Toolbar-inverted.png);
+  }
+
   #back-button:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(18px, 36px, 36px, 18px);
   }
 
   #forward-button:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(18px, 72px, 36px, 54px);
   }
 
@@ -741,21 +749,23 @@ toolbar .toolbarbutton-1 > .toolbarbutto
   }
 }
 
 @media (min-resolution: 2dppx) {
   /* Whitelist built-in buttons, instead of .toolbarbutton-1,
      to avoid potentially breaking add-on toolbar buttons. */
 
   :-moz-any(@primaryToolbarButtons@),
+  #home-button.bookmark-item,
   #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
   }
 
   :-moz-any(@primaryToolbarButtons@):not(@inAnyPanel@):-moz-lwtheme-brighttext,
+  #home-button.bookmark-item:not(@inAnyPanel@):-moz-lwtheme-brighttext,
   #bookmarks-menu-button:not(@inAnyPanel@):-moz-lwtheme-brighttext > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
     list-style-image: url("chrome://browser/skin/Toolbar-inverted@2x.png");
   }
 
   #back-button {
     -moz-image-region: rect(0, 72px, 36px, 36px);
   }
 
@@ -2600,22 +2610,22 @@ sidebarheader > .tabs-closebutton > .too
   color: -moz-DialogText;
   text-shadow: none;
 }
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-.bookmark-item:not(#home-button) {
+.bookmark-item {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 @media (min-resolution: 2dppx) {
-  .bookmark-item:not(#home-button) {
+  .bookmark-item {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
   }
 
   image.bookmark-item {
     width: 16px;
   }
 }