diff options
| author | Mark Otto <[email protected]> | 2012-11-04 19:42:13 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 19:42:13 -0800 |
| commit | ebed09ec01751493c216ddd4090dfd1df79812e4 (patch) | |
| tree | c8a282d2d2dee5e14244c7557f8f14827292f852 | |
| parent | 823b5accd327e129e301b2f0508d911fe0d194c6 (diff) | |
| parent | f3b38146068628e4be59084190a89c65d648e535 (diff) | |
| download | bootstrap-ebed09ec01751493c216ddd4090dfd1df79812e4.tar.xz bootstrap-ebed09ec01751493c216ddd4090dfd1df79812e4.zip | |
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 12 | ||||
| -rw-r--r-- | less/forms.less | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 11b081093..49e63bd31 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1588,16 +1588,16 @@ input[type="checkbox"][readonly] { border-color: #3a87ad; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; diff --git a/less/forms.less b/less/forms.less index 739b40d11..172ed027d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -366,9 +366,9 @@ input[type="checkbox"][readonly] { // HTML5 invalid states // Shares styles with the .control-group.error above -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; &:focus { |