Bug 982835 - Australis bookmark subview hover color is wrong when in main menu panel, r=mikedeboer
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 13 Mar 2014 13:56:38 +0100
changeset 173455 6213d1669c1a9cf09afb34295fe2c4899198707c
parent 173454 53e8cf0a814b9568b3814998a8c4ab3ec200be6b
child 173456 762cdef7ecb4dd33ca57c7fe2b8fbcf38c20426a
push id26406
push userkwierso@gmail.com
push dateFri, 14 Mar 2014 02:09:34 +0000
treeherdermozilla-central@f073b3d6db1f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs982835
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 982835 - Australis bookmark subview hover color is wrong when in main menu panel, r=mikedeboer
browser/themes/osx/browser.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -193,17 +193,17 @@ toolbarbutton.bookmark-item:not(.subview
 }
 
 .bookmark-item > .toolbarbutton-text,
 #personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
   display: -moz-box !important; /* Force the display of the label for bookmarks */
   margin: 0 !important;
 }
 
-toolbarbutton.bookmark-item:not(#bookmarks-menu-button):hover,
+toolbarbutton.bookmark-item:not(.subviewbutton):not(#bookmarks-menu-button):hover,
 toolbarbutton.bookmark-item:not(#bookmarks-menu-button)[open="true"] {
   background-color: rgba(0, 0, 0, .205);
 }
 
 toolbarbutton.bookmark-item:hover:not(.subviewbutton),
 toolbarbutton.bookmark-item[open="true"]:not(.subviewbutton) {
   color: #FFF !important;
   text-shadow: 0 1px rgba(0, 0, 0, .4) !important;
@@ -216,17 +216,17 @@ toolbarbutton.bookmark-item[open="true"]
 
 @media (min-resolution: 2dppx) {
   .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
   .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
     -moz-image-region: rect(10px, 14px, 20px, 0);
   }
 }
 
-toolbarbutton.bookmark-item:not(#bookmarks-menu-button):active:hover,
+toolbarbutton.bookmark-item:not(.subviewbutton):not(#bookmarks-menu-button):active:hover,
 toolbarbutton.bookmark-item:not(#bookmarks-menu-button)[open="true"] {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
   background-color: rgba(0, 0, 0, .5);
 }
 
 toolbarbutton.bookmark-item > menupopup {
   margin-top: 2px;
   -moz-margin-start: 3px;