diff options
| author | Mark Otto <[email protected]> | 2012-03-22 17:41:20 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 17:41:20 -0700 |
| commit | edca6f28f0ae78cdc3dbfe0ce5183153830a77ee (patch) | |
| tree | 0874443389383543a82a881c53b66821cc054ca5 | |
| parent | b7b84c7a0dfaad5134258b5a50e8d42bd0656b81 (diff) | |
| download | bootstrap-edca6f28f0ae78cdc3dbfe0ce5183153830a77ee.tar.xz bootstrap-edca6f28f0ae78cdc3dbfe0ce5183153830a77ee.zip | |
fix #2718, misaligned uneditable inputs in prepends/appends
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55573 -> 55576 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/forms.less | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 82d184fdc..fac56f1bb 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 825c764f3..393d9e606 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -951,7 +951,6 @@ select:focus:required:invalid:focus { clear: both; } .uneditable-input { - display: block; background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -994,6 +993,7 @@ select:focus:required:invalid:focus { .input-append .uneditable-input { margin-bottom: 0; *margin-left: 0; + vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; diff --git a/less/forms.less b/less/forms.less index a53b273b9..ffd198372 100644 --- a/less/forms.less +++ b/less/forms.less @@ -321,7 +321,6 @@ select:focus:required:invalid { // For text that needs to appear as an input but should not be an input .uneditable-input { - display: block; background-color: @inputBackground; border-color: #eee; .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); @@ -367,6 +366,7 @@ select:focus:required:invalid { .uneditable-input { margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms *margin-left: 0; + vertical-align: middle; .border-radius(0 3px 3px 0); &:focus { position: relative; |