From cc2542ffd9ee17fbcde556fd11a2aa0e5fd7c33c Mon Sep 17 00:00:00 2001
From: Jonathan Wilde <jwilde@jwilde.me>
Date: Thu, 18 Jul 2013 00:22:30 -0700
Subject: [PATCH] Bug 885242 - Part 6 - Implement proper disabled states.
 r=mbrubeck

--HG--
extra : rebase_source : f7a23ae819244653620883566e3f5a082e94d85a
---
 browser/metro/theme/platform.css | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/browser/metro/theme/platform.css b/browser/metro/theme/platform.css
index b30417aebe0c..ab3ac49743b1 100644
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -744,20 +744,20 @@ appbar toolbar[labelled] > toolbarbutton > .toolbarbutton-text {
   -moz-image-region: rect(0 40px 40px 0);
 }
 
-.appbar-primary:not([checked]):hover:not(:active) {
+.appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
   -moz-image-region: rect(0 80px 40px 40px);
 }
 
-.appbar-primary:not([checked]):active,
+.appbar-primary:not([checked]):active:not([disabled]),
 .appbar-primary[checked] {
   -moz-image-region: rect(0 120px 40px 80px);
 }
 
-.appbar-primary[checked]:hover:not(:active) {
+.appbar-primary[checked]:hover:not(:active):not([disabled]) {
   -moz-image-region: rect(0 160px 40px 120px);
 }
 
-.appbar-primary[checked]:active {
+.appbar-primary[checked]:active:not([disabled]) {
   -moz-image-region: rect(0 200px 40px 160px);
 }
 
@@ -766,20 +766,20 @@ appbar toolbar[labelled] > toolbarbutton > .toolbarbutton-text {
     -moz-image-region: rect(0 56px 56px 0);
   }
 
-  .appbar-primary:not([checked]):hover:not(:active) {
+  .appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
     -moz-image-region: rect(0 112px 56px 56px);
   }
 
-  .appbar-primary:not([checked]):active,
+  .appbar-primary:not([checked]):active:not([disabled]),
   .appbar-primary[checked] {
     -moz-image-region: rect(0 168px 56px 112px);
   }
 
-  .appbar-primary[checked]:hover:not(:active) {
+  .appbar-primary[checked]:hover:not(:active):not([disabled]) {
     -moz-image-region: rect(0 224px 56px 168px);
   }
 
-  .appbar-primary[checked]:active {
+  .appbar-primary[checked]:active:not([disabled]) {
     -moz-image-region: rect(0 280px 56px 224px);
   }
 }
@@ -789,20 +789,20 @@ appbar toolbar[labelled] > toolbarbutton > .toolbarbutton-text {
     -moz-image-region: rect(0 72px 72px 0);
   }
 
-  .appbar-primary:not([checked]):hover:not(:active) {
+  .appbar-primary:not([checked]):hover:not(:active):not([disabled]) {
     -moz-image-region: rect(0 144px 72px 72px);
   }
 
-  .appbar-primary:not([checked]):active,
+  .appbar-primary:not([checked]):active:not([disabled]),
   .appbar-primary[checked] {
     -moz-image-region: rect(0 216px 72px 144px);
   }
 
-  .appbar-primary[checked]:hover:not(:active) {
+  .appbar-primary[checked]:hover:not(:active):not([disabled]) {
     -moz-image-region: rect(0 288px 72px 216px);
   }
 
-  .appbar-primary[checked]:active {
+  .appbar-primary[checked]:active:not([disabled]) {
     -moz-image-region: rect(0 360px 72px 288px);
   }
 }