kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

add a super jank fix for horizontal-forms and .input-prepend/append in IE7

This commit is contained in:
Mark Otto 2012-03-12 00:15:27 -07:00
parent c35b04cccd
commit 685039d608
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/assets/css/bootstrap.css vendored
View File

@ -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;

5
less/forms.less
View File

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