summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 07:47:02 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 07:47:02 +0000
commit5ed550d5336a5c159adf5dd319a62d13d01c0eed (patch)
treec03154bfa6d381f1279d46282009fdd37ac6e4ef
parent47bc47f6add650795e70d7c21b9c2555c7de5f72 (diff)
downloadchromium_src-5ed550d5336a5c159adf5dd319a62d13d01c0eed.zip
chromium_src-5ed550d5336a5c159adf5dd319a62d13d01c0eed.tar.gz
chromium_src-5ed550d5336a5c159adf5dd319a62d13d01c0eed.tar.bz2
DOMUI: Fix css for disabled action buttons
Change the order and make the rules a bit more specific to handle disabled action buttons. Review URL: http://codereview.chromium.org/2805028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50833 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/shared/css/button.css17
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/resources/shared/css/button.css b/chrome/browser/resources/shared/css/button.css
index 5edb8f4..8a3d930 100644
--- a/chrome/browser/resources/shared/css/button.css
+++ b/chrome/browser/resources/shared/css/button.css
@@ -19,13 +19,6 @@ button:focus {
border: 2px solid #426dc9;
}
-button:disabled {
- border: 1px solid rgba(0, 0, 0, .35);
- color: rgba(0, 0, 0, .30);
- background: -webkit-gradient(linear, 0 0, 0 100%,
- from(#ffffff), to(#e3e3e3));
-}
-
button.action {
border: 1px solid #2e4987;
font-weight: bold;
@@ -40,7 +33,15 @@ button.action:focus {
-webkit-box-shadow: 1px 1px 0 #dbdbdb inset, -1px -1px 0 #dbdbdb inset;
}
-button.action:active {
+/* make sure we do not use active when disabled */
+button.action:active:not(:disabled) {
background: -webkit-gradient(linear, 0 0, 0 100%,
from(#426dc9), to(#6391de));
}
+
+button:disabled {
+ border: 1px solid rgba(0, 0, 0, .35);
+ color: rgba(0, 0, 0, .30);
+ background: -webkit-gradient(linear, 0 0, 0 100%,
+ from(#ffffff), to(#e3e3e3));
+}