mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
This commit is contained in:
parent
c35b04cccd
commit
685039d608
Binary file not shown.
6
docs/assets/css/bootstrap.css
vendored
6
docs/assets/css/bootstrap.css
vendored
@ -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;
|
||||
|
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user