1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00

Merge branch 'au-phiware-patch-1' into 2.0.3-wip

This commit is contained in:
Mark Otto 2012-04-14 20:56:13 -07:00
commit 3bc7553f66

View File

@ -552,7 +552,7 @@ 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 */
// 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;