Bug 69710 Disabled menu items need more three-dimensional appearance r=dao
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Fri, 10 Oct 2008 00:00:46 +0100
changeset 20229 6251e69516c9280e9e057c106f5cd6178aedecbd
parent 20228 6a224120250dd74f99cc1455a34bceefad08613c
child 20230 4f1e7711b92f109b3fd1bc9e11e0c40282c89d0d
child 20231 3fe2918df5333703987b30634ea54d2a90354c6c
push idunknown
push userunknown
push dateunknown
reviewersdao
bugs69710
milestone1.9.1b2pre
Bug 69710 Disabled menu items need more three-dimensional appearance r=dao
toolkit/themes/gnomestripe/global/checkbox.css
toolkit/themes/gnomestripe/global/radio.css
toolkit/themes/winstripe/global/button.css
toolkit/themes/winstripe/global/checkbox.css
toolkit/themes/winstripe/global/formatting.css
toolkit/themes/winstripe/global/groupbox.css
toolkit/themes/winstripe/global/menu.css
toolkit/themes/winstripe/global/radio.css
toolkit/themes/winstripe/global/toolbarbutton.css
--- a/toolkit/themes/gnomestripe/global/checkbox.css
+++ b/toolkit/themes/gnomestripe/global/checkbox.css
@@ -90,33 +90,33 @@ checkbox:focus > .checkbox-label-center-
 
 /* ..... disabled state ..... */
 
 checkbox[disabled="true"] > .checkbox-spacer-box > .checkbox-check {
   background-color: -moz-Dialog;
 }
 
 checkbox[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
 }
 
 /* ::::: checkmark image ::::: */
 
 .checkbox-check {
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
   min-width: 13px;
   min-height: 13px;
   background: -moz-Field no-repeat 50% 50%;
 }
 
-checkbox:hover {
+checkbox:not([disabled="true"]):hover {
   color: -moz-buttonhovertext;
 }
 
 checkbox:hover:active > .checkbox-spacer-box > .checkbox-check {
   background-color: -moz-Dialog;
 }
 
 /* ..... checked state ..... */
--- a/toolkit/themes/gnomestripe/global/radio.css
+++ b/toolkit/themes/gnomestripe/global/radio.css
@@ -90,17 +90,17 @@ radio[focused="true"] > .radio-label-cen
 
 /* ..... disabled state ..... */
 
 radio[disabled="true"] > .radio-spacer-box > .radio-check-box1 {
   background-color: -moz-Dialog;
 }
 
 radio[disabled="true"] {
-  color: GrayText !important;
+  color: GrayText;
 }
 
 /* ::::: checkmark image ::::: */
 
 .radio-check-box1 {
   border-top: 1px solid ThreeDShadow;
   border-right: 1px solid ThreeDHighlight;
   border-bottom: 1px solid ThreeDHighlight;
@@ -118,17 +118,17 @@ radio[disabled="true"] {
   border-left: 1px solid ThreeDDarkShadow;
   -moz-border-radius: 50%;
   padding: 2px;
   width: 4px;
   height: 4px;
   list-style-image: none;
 }
 
-radio:hover {
+radio:not([disabled="true"]):hover {
   color: -moz-buttonhovertext;
 }
 
 radio:hover:active > .radio-spacer-box > .radio-check-box1 {
   background-color: -moz-Dialog;
 }
 
 /* ..... selected state ..... */
--- a/toolkit/themes/winstripe/global/button.css
+++ b/toolkit/themes/winstripe/global/button.css
@@ -98,35 +98,40 @@ button:hover:active,
 button[open="true"],
 button[checked="true"] {
   -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -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;
   -moz-padding-end: 3px;
 }
 
 /* .......... disabled state .......... */
 
 button[disabled="true"] {
   -moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
   -moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
   -moz-border-bottom-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
   -moz-border-left-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
   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;
   -moz-padding-start: 3px !important;
   -moz-padding-end: 4px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
--- a/toolkit/themes/winstripe/global/checkbox.css
+++ b/toolkit/themes/winstripe/global/checkbox.css
@@ -75,17 +75,22 @@ checkbox:focus > .checkbox-label-box {
 
 /* ..... disabled state ..... */
 
 checkbox[disabled="true"] > .checkbox-check {
   background-color: -moz-Dialog;
 }
 
 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 ::::: */
 
 .checkbox-check {
   -moz-appearance: checkbox;
   -moz-box-align: center;
   border: 2px solid;
--- a/toolkit/themes/winstripe/global/formatting.css
+++ b/toolkit/themes/winstripe/global/formatting.css
@@ -131,16 +131,22 @@
       padding: 0px;
     }
 
   label[disabled="true"] 
     {
       color                 : GrayText;
     }    
 
+  label[disabled="true"]:-moz-system-metric(windows-classic)
+    {
+      color                 : ThreeDShadow;
+      text-shadow           : 1px 1px ThreeDHighlight;
+    }
+
   description, label
     {
       cursor              : default;
     }
     
   description
     {
       margin              : 1px 5px 4px 5px;
--- a/toolkit/themes/winstripe/global/groupbox.css
+++ b/toolkit/themes/winstripe/global/groupbox.css
@@ -45,17 +45,17 @@
 
 groupbox {
   margin: 5px;
   border: 1px solid ThreeDShadow;
   -moz-border-radius: 5px;
   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;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDHighlight;
   -moz-border-radius: 0px;
 }
 
--- a/toolkit/themes/winstripe/global/menu.css
+++ b/toolkit/themes/winstripe/global/menu.css
@@ -59,16 +59,22 @@ menuitem[default="true"] {
 }
 
 menu[disabled="true"], menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
 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;
 }
 
 /* ..... internal content .... */
 
 .menu-accel,
 .menu-iconic-accel,
@@ -208,16 +214,21 @@ menulist > menupopup > menuitem[_moz-men
   background-color: highlight;
   color: highlighttext;
 }
 
 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;
 }
 
 /* ::::: checkbox and radio menuitems ::::: */
 
 menuitem[type="checkbox"],
 menuitem[checked="true"] {
--- a/toolkit/themes/winstripe/global/radio.css
+++ b/toolkit/themes/winstripe/global/radio.css
@@ -78,17 +78,22 @@ radio[focused="true"] > .radio-label-box
 
 /* ..... disabled state ..... */
 
 radio[disabled="true"] > .radio-check-box1 {
   background-color: -moz-Dialog;
 }
 
 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 ::::: */
 
 .radio-check-box1 {
   -moz-appearance: radio;
   margin: 1px 0px;
   border-top: 1px solid ThreeDShadow;
--- a/toolkit/themes/winstripe/global/toolbarbutton.css
+++ b/toolkit/themes/winstripe/global/toolbarbutton.css
@@ -89,20 +89,30 @@ toolbarbutton[open="true"] {
   padding-bottom: 2px;
   -moz-padding-start: 4px;
   -moz-padding-end: 2px;
 }
 
 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 ..... */
 
 toolbarbutton[checked="true"] {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
   padding-top: 4px !important;
   padding-bottom: 2px !important;