Bug 885242 - Part 6 - Implement proper disabled states. r=mbrubeck
☠☠ backed out by c81600630212 ☠ ☠
authorJonathan Wilde <jwilde@jwilde.me>
Thu, 18 Jul 2013 00:22:30 -0700
changeset 138979 ba3297faeb618cd0a38c70ce1d05dc479312965d
parent 138978 b6e4c716ea9ca419f51024c614e01dfd1fce795a
child 138980 03a5140d2527ef777f22312b9125a9240f2ee156
push id31191
push userhello@jwilde.me
push dateThu, 18 Jul 2013 07:29:41 +0000
treeherdermozilla-inbound@ba3297faeb61 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs885242
milestone25.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 885242 - Part 6 - Implement proper disabled states. r=mbrubeck
browser/metro/theme/images/navbar-back.png
browser/metro/theme/images/navbar-back@1.4x.png
browser/metro/theme/images/navbar-forward.png
browser/metro/theme/images/navbar-forward@1.4x.png
browser/metro/theme/images/navbar-menu.png
browser/metro/theme/images/navbar-menu@1.4x.png
browser/metro/theme/images/navbar-pin.png
browser/metro/theme/images/navbar-pin@1.4x.png
browser/metro/theme/images/navbar-star.png
browser/metro/theme/images/navbar-star@1.4x.png
browser/metro/theme/platform.css
--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -733,75 +733,75 @@ appbar toolbar[labelled] > toolbarbutton
 
    States from left to right:
    normal, hover, active/toggled, toggled+hover, toggled+active. */
 
 .appbar-primary {
   -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);
 }
 
 @media (min-resolution: @min_res_140pc@) {
   .appbar-primary {
     -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);
   }
 }
 
 @media (min-resolution: @min_res_180pc@) {
   .appbar-primary {
     -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);
   }
 }
 
 /* Secondary sprite format: one sprite for everything */
 
 .appbar-secondary {
   list-style-image: url(chrome://browser/skin/images/appbar-icons.png);