diff options
| author | Mark Otto <[email protected]> | 2012-03-12 00:15:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-12 00:16:01 -0700 |
| commit | 685039d608e16fc207ed2d8b5f31d47d6d0e6ae6 (patch) | |
| tree | 95254853848cac0848f210a65606e042548c10e4 | |
| parent | c35b04cccda86164268508b59aa28655a31c1793 (diff) | |
| download | bootstrap-685039d608e16fc207ed2d8b5f31d47d6d0e6ae6.tar.xz bootstrap-685039d608e16fc207ed2d8b5f31d47d6d0e6ae6.zip | |
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55433 -> 55526 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/forms.less | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex a5d00d95e..e081f80df 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 edeaf8bba..e6ccb8b14 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -990,6 +990,7 @@ select:focus:required:invalid:focus { .input-append select, .input-prepend .uneditable-input, .input-append .uneditable-input { + *margin-left: 0; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; @@ -1167,6 +1168,11 @@ legend + .control-group { } .form-horizontal .controls { margin-left: 160px; + /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ + + *display: inline-block; + *margin-left: 0; + *padding-left: 20px; } .form-horizontal .help-block { margin-top: 9px; diff --git a/less/forms.less b/less/forms.less index 6e1d0fae3..8d9c25308 100644 --- a/less/forms.less +++ b/less/forms.less @@ -365,6 +365,7 @@ select:focus:required:invalid { input, select, .uneditable-input { + *margin-left: 0; .border-radius(0 3px 3px 0); &:focus { position: relative; @@ -537,6 +538,10 @@ legend + .control-group { // Move over all input controls and content .controls { margin-left: 160px; + /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ + *display: inline-block; + *margin-left: 0; + *padding-left: 20px; } // Remove bottom margin on block level help text since that's accounted for on .control-group .help-block { |