Bug 69710 Disabled menu items need more three-dimensional appearance r=dao

toolkit/themes/gnomestripe/global/checkbox.css

@@ -95,7 +95,7 @@ checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check {
 }
 
 checkbox[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
 }
 
 /* ::::: checkmark image ::::: */
@@ -111,7 +111,7 @@ checkbox[disabled="true"] {
   background: -moz-Field no-repeat 50% 50%;
 }
 
-checkbox:hover {
+checkbox:not([disabled="true"]):hover {
   color: -moz-buttonhovertext;
 }
 

toolkit/themes/gnomestripe/global/radio.css

@@ -95,7 +95,7 @@ radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 {
 }
 
 radio[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
 }
 
 /* ::::: checkmark image ::::: */
@@ -123,7 +123,7 @@ radio[disabled="true"] {
   list-style-image: none;
 }
 
-radio:hover {
+radio:not([disabled="true"]):hover {
   color: -moz-buttonhovertext;
 }
 

toolkit/themes/winstripe/global/button.css

@@ -103,9 +103,9 @@ button[checked="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
 }
 
-button:hover:active > .button-box:not(:-moz-system-metric(windows-default-theme)),
-button[open="true"] > .button-box:not(:-moz-system-metric(windows-default-theme)),
-button[checked="true"] > .button-box:not(:-moz-system-metric(windows-default-theme)) {
+button:hover:active > .button-box:-moz-system-metric(windows-classic),
+button[open="true"] > .button-box:-moz-system-metric(windows-classic),
+button[checked="true"] > .button-box:-moz-system-metric(windows-classic) {
   padding-top: 2px;
   padding-bottom: 1px;
   -moz-padding-start: 4px;
@@ -122,6 +122,11 @@ button[disabled="true"] {
   color: GrayText;
 }
 
+button[disabled="true"]:-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
+}
+
 button[disabled="true"] > .button-box {
   padding-top: 1px !important;
   padding-bottom: 2px !important;

toolkit/themes/winstripe/global/checkbox.css

@@ -80,7 +80,12 @@ checkbox[disabled="true"] > .checkbox-check {
 }
 
 checkbox[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
+}
+
+checkbox[disabled="true"]:-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
 }
 
 /* ::::: checkmark image ::::: */

toolkit/themes/winstripe/global/formatting.css

@@ -136,6 +136,12 @@
       color                 : GrayText;
     }    
 
+  label[disabled="true"]:-moz-system-metric(windows-classic)
+    {
+      color                 : ThreeDShadow;
+      text-shadow           : 1px 1px ThreeDHighlight;
+    }
+
   description, label
     {
       cursor              : default;

toolkit/themes/winstripe/global/groupbox.css

@@ -50,7 +50,7 @@ groupbox {
   padding: 5px;
 }
 
-groupbox:not(:-moz-system-metric(windows-default-theme)) {
+groupbox:-moz-system-metric(windows-classic) {
   border-width: 2px;
   -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
   -moz-border-right-colors: ThreeDHighlight ThreeDShadow;

toolkit/themes/winstripe/global/menu.css

@@ -64,6 +64,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   color: GrayText;
 }
 
+menu[disabled="true"]:not([_moz-menuactive="true"]):-moz-system-metric(windows-classic),
+menuitem[disabled="true"]:not([_moz-menuactive="true"]):-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
+}
+
 menuitem.spell-suggestion {
   font-weight:bold;
 }
@@ -213,6 +219,11 @@ menulist > menupopup > menuitem[_moz-menuactive="true"][disabled="true"] {
   color: GrayText;
 }
 
+menulist > menupopup > menuitem[disabled="true"]:not([_moz-menuactive="true"]):-moz-system-metric(windows-classic) {
+  color: GrayText;
+  text-shadow: none;
+}
+
 menulist > menupopup > menuitem > .menu-iconic-text {
   margin: 0 !important;
 }

toolkit/themes/winstripe/global/radio.css

@@ -83,7 +83,12 @@ radio[disabled="true"] > .radio-check-box1 {
 }
 
 radio[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
+}
+
+radio[disabled="true"]:-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
 }
 
 /* ::::: checkmark image ::::: */

toolkit/themes/winstripe/global/toolbarbutton.css

@@ -94,10 +94,20 @@ toolbarbutton[open="true"] {
 toolbarbutton[disabled="true"],
 toolbarbutton[disabled="true"]:hover,
 toolbarbutton[disabled="true"]:hover:active,
-toolbarbutton[disabled="true"][open="true"] {
+toolbarbutton[disabled="true"][open="true"],
+toolbarbutton[disabled="true"][checked="true"] {
   border-color: transparent;
   padding: 3px;
-  color: GrayText !important;
+  color: GrayText;
+}
+
+toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic),
+toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic):hover,
+toolbarbutton[disabled="true"]:-moz-system-metric(windows-classic):hover:active,
+toolbarbutton[disabled="true"][open="true"]:-moz-system-metric(windows-classic),
+toolbarbutton[disabled="true"][checked="true"]:-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
 }
 
 /* ..... checked state ..... */