aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-04 19:41:59 -0800
committerMark Otto <[email protected]>2012-11-04 19:41:59 -0800
commitf3b38146068628e4be59084190a89c65d648e535 (patch)
treeb1f7ba25bef260133d7dd1d378f3aaeece8a695b
parent7e6cc0bf7ec795189dc14e6b27ffd25940081c71 (diff)
parent76f9c9128e95f55efee66ade30b7f8a31b34208e (diff)
downloadbootstrap-f3b38146068628e4be59084190a89c65d648e535.tar.xz
bootstrap-f3b38146068628e4be59084190a89c65d648e535.zip
Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
-rw-r--r--docs/assets/css/bootstrap.css12
-rw-r--r--less/forms.less6
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 {