From 1c55b3a969797d95d57fe6652c802daba8a38786 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 3 Apr 2013 17:55:31 +0200 Subject: [PATCH 1/3] button selector cleanup --- core/css/styles.css | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 5456475b31..a5a867dc0e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -37,8 +37,14 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC /* INPUTS */ -input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], -textarea, select, button, .button, #quota, div.jp-progress, .pager li a { +input[type="text"], +input[type="password"], +input[type="search"], +input[type="number"], +input[type="email"], +textarea, select, +button, .button, +#quota, div.jp-progress, .pager li a { width:10em; margin:.3em; padding:.6em .5em .4em; font-size:1em; font-family:Arial, Verdana, sans-serif; background:#fff; color:#333; border:1px solid #ddd; outline:none; @@ -74,14 +80,22 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# /* BUTTONS */ -input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { +input[type="submit"], +input[type="button"], +button, .button, +#quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer; -moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } -input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { - background:rgba(250,250,250,.9); color:#333; +input[type="submit"]:hover, input[type="submit"]:focus, +input[type="button"]:hover, input[type="button"]:focus, +button:hover, button:focus, +.button:hover, .button:focus, +select:hover, select:focus, select:active { + background:rgba(250,250,250,.9); + color:#333; } input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } #header .button { border:none; -moz-box-shadow:none; -webkit-box-shadow:none; box-shadow:none; } From a35d869e15c9a18c12e6e3f5694b7969aeb25fde Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 3 Apr 2013 18:45:03 +0200 Subject: [PATCH 2/3] add styles for disabled input fields --- core/css/styles.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index a5a867dc0e..20a9da776d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -100,6 +100,15 @@ select:hover, select:focus, select:active { input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } #header .button { border:none; -moz-box-shadow:none; -webkit-box-shadow:none; box-shadow:none; } +/* disabled input fields and buttons */ +input:disabled, input:disabled:hover, input:disabled:focus, +button:disabled, button:disabled:hover, button:disabled:focus, +.button:disabled, .button:disabled:hover, .button:disabled:focus { + background: rgba(230,230,230,.9); + color: #999; + cursor: default; +} + /* Primary action button, use sparingly */ .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { border:1px solid #1d2d44; From cd079e3421e18ec394559860bcd98213f0bd0e1b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 3 Apr 2013 20:06:26 +0200 Subject: [PATCH 3/3] group some selectors again --- core/css/styles.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 20a9da776d..f290102a33 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -37,11 +37,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC /* INPUTS */ -input[type="text"], -input[type="password"], -input[type="search"], -input[type="number"], -input[type="email"], +input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea, select, button, .button, #quota, div.jp-progress, .pager li a { @@ -80,8 +76,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# /* BUTTONS */ -input[type="submit"], -input[type="button"], +input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em;