Bug 1076252 - [10.10] disabled default button shouldn't get white text on yosemite, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 02 Oct 2014 22:52:09 +0100
changeset 232152 928113e10414bfc9e616541d3825c50aaa2268c3
parent 232151 a70f7e0a4717f5e0ca723595643c6b309cbfcc39
child 232153 3d6d136be24ff0294d12692cebc862b8ab641683
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1076252
milestone35.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 1076252 - [10.10] disabled default button shouldn't get white text on yosemite, r=jaws
toolkit/themes/osx/global/button.css
--- a/toolkit/themes/osx/global/button.css
+++ b/toolkit/themes/osx/global/button.css
@@ -9,23 +9,23 @@ button {
   /* The horizontal margin used here come from the Aqua Human Interface
      Guidelines, there should be 12 pixels between two buttons. */
   margin: 5px 6px 3px;
   min-width: 79px;
   color: ButtonText;
   text-shadow: none;
 }
 
-button:hover:active {
+button:not([disabled="true"]):hover:active {
   color: -moz-mac-buttonactivetext;
 }
 
 /* When the window isn't focused, the default button background isn't drawn,
  * so don't change the text color then: */
-button[default="true"]:not(:-moz-window-inactive) {
+button[default="true"]:not([disabled="true"]):not(:-moz-window-inactive) {
   color: -moz-mac-defaultbuttontext;
 }
 
 /* Likewise, when active (mousedown) but not hovering, the default button
  * background isn't drawn, override the previous selector for that case: */
 button[default="true"]:not(:hover):active {
   color: ButtonText;
 }