From 3c74f1cd08894213b6f6b8261a6e06f9d92a515f Mon Sep 17 00:00:00 2001 From: Vivien Nicolas <21@vingtetun.org> Date: Mon, 14 Sep 2009 12:50:21 -0400 Subject: [PATCH] Bug 516376: no pressed/checked state css rules for some buttons [r=mark.finkle] --- mobile/chrome/content/bindings/extensions.xml | 4 ++- mobile/chrome/content/browser-ui.js | 2 +- mobile/chrome/content/browser.xul | 12 ++++----- mobile/themes/hildon/platform.css | 13 +++++++--- mobile/themes/wince/platform.css | 26 ++++++++++++++++--- 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/mobile/chrome/content/bindings/extensions.xml b/mobile/chrome/content/bindings/extensions.xml index 565db0fcc063..6ef68bade5cd 100644 --- a/mobile/chrome/content/bindings/extensions.xml +++ b/mobile/chrome/content/bindings/extensions.xml @@ -31,7 +31,7 @@ - - + @@ -434,10 +434,9 @@ diff --git a/mobile/themes/hildon/platform.css b/mobile/themes/hildon/platform.css index 6ead9d2db262..cfddc8207531 100644 --- a/mobile/themes/hildon/platform.css +++ b/mobile/themes/hildon/platform.css @@ -100,6 +100,7 @@ button { -moz-appearance: none !important; } +button[type="checkbox"][checked="true"], button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/button-active-64.png") 8 repeat repeat; } @@ -121,6 +122,7 @@ notification button { -moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat; } +button.button-dark[type="checkbox"][checked="true"], button.button-dark:not([disabled="true"]):active:hover, notification button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat; @@ -163,6 +165,7 @@ toolbarbutton.button-dark { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-64.png") 10 repeat repeat; } +toolbarbutton.button-dark[type="checkbox"][checked="true"], toolbarbutton.button-dark:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-64.png") 10 repeat repeat; } @@ -171,10 +174,11 @@ toolbarbutton.button-dark[disabled="true"] { color: #ddd; } -toolbarbutton.button-dark[checked="true"] { +toolbarbutton.button-dark[type="checkbox"][checked="true"] { /* checked overrides */ - border: 8px solid transparent !important; - background: #303030 !important; + border: 10px solid transparent !important; + color: #fff !important; + background: none !important; padding: 0.5mm 1mm !important; } @@ -265,6 +269,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-64.png") 8 repeat repeat; } +.toggle-dark:not([disabled=true]) radio:active:hover, .toggle-dark radio[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-64.png") 8 repeat repeat; } @@ -273,6 +278,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat; } +.toggle-dark:not([disabled=true]) radio:first-child:active:hover, .toggle-dark radio:first-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat; } @@ -281,6 +287,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat; } +.toggle-dark:not([disabled=true]) radio:last-child:active:hover, .toggle-dark radio:last-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat; } diff --git a/mobile/themes/wince/platform.css b/mobile/themes/wince/platform.css index 1c5baf311062..c65f95297b83 100644 --- a/mobile/themes/wince/platform.css +++ b/mobile/themes/wince/platform.css @@ -92,6 +92,7 @@ button[disabled="true"] { -moz-border-image: url("chrome://browser/skin/images/button-default-64.png") 8 repeat repeat; } + button[type="checkbox"][checked="true"], button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/button-active-64.png") 8 repeat repeat; } @@ -104,6 +105,7 @@ button[disabled="true"] { -moz-border-image: url("chrome://browser/skin/images/button-default-36.png") 4 repeat repeat; } + button[type="checkbox"][checked="true"], button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/button-active-36.png") 4 repeat repeat; } @@ -132,6 +134,7 @@ button.button-dark[disabled="true"] { -moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat; } + button.button-dark[type="checkbox"][checked="true"], button.button-dark:not([disabled="true"]):active:hover, notification button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat; @@ -145,6 +148,7 @@ button.button-dark[disabled="true"] { -moz-border-image: url("chrome://browser/skin/images/buttondark-default-36.png") 4 repeat repeat; } + button.button-dark[type="checkbox"][checked="true"], button.button-dark:not([disabled="true"]):active:hover, notification button:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/buttondark-active-36.png") 4 repeat repeat; @@ -200,10 +204,10 @@ toolbarbutton.button-dark[disabled="true"] { color: #ddd; } -toolbarbutton.button-dark[checked="true"] { +toolbarbutton.button-dark[type="checkbox"][checked="true"] { /* checked overrides */ - border: 0.05mm solid #202020 !important; - background: #303030 !important; + color: #fff !important; + background: none !important; padding: 0.25mm 0.5mm !important; } @@ -214,9 +218,14 @@ toolbarbutton.button-dark[checked="true"] { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-64.png") 10 repeat repeat; } + toolbarbutton.button-dark[type="checkbox"][checked="true"], toolbarbutton.button-dark:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-64.png") 10 repeat repeat; } + + toolbarbutton.button-dark[type="checkbox"][checked="true"] { + border: 10px solid transparent !important; + } } /* low-res screens */ @@ -226,9 +235,14 @@ toolbarbutton.button-dark[checked="true"] { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-36.png") 6 repeat repeat; } + toolbarbutton.button-dark[type="checkbox"][checked="true"], toolbarbutton.button-dark:not([disabled="true"]):active:hover { -moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-36.png") 6 repeat repeat; } + + toolbarbutton.button-dark[type="checkbox"][checked="true"] { + border: 6px solid transparent !important; + } } /* image buttons ----------------------------------------------------------- */ @@ -385,6 +399,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-64.png") 8 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:active:hover, .toggle-dark radio[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-64.png") 8 repeat repeat; } @@ -393,6 +408,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:first-child:active:hover, .toggle-dark radio:first-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat; } @@ -401,6 +417,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:last-child:active:hover, .toggle-dark radio:last-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat; } @@ -412,6 +429,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-36.png") 4 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:active:hover, .toggle-dark radio[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-36.png") 4 repeat repeat; } @@ -420,6 +438,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-36.png") 4 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:first-child:active:hover, .toggle-dark radio:first-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-36.png") 4 repeat repeat; } @@ -428,6 +447,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-36.png") 4 repeat repeat; } + .toggle-dark:not([disabled=true]) radio:last-child:active:hover, .toggle-dark radio:last-child[selected] { -moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-36.png") 4 repeat repeat; }