Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

ebed09ec · Mark Otto · 823b5acc · f3b38146 · ebed09ec · ebed09ec
Commit ebed09ec authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 9 deletions
+9 -9
--- 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;

--- 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 {