aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-14 20:56:13 -0700
committerMark Otto <[email protected]>2012-04-14 20:56:13 -0700
commit3bc7553f66482d1c8209f4644d022a05b6a8319c (patch)
treefa5ae87d9f6059de6dc59057cb9bf8e8d8b53b02 /less/forms.less
parentfc7ae48c95af554cb36e4b52482c262ac34aa47f (diff)
parent16855b920e05b86aa7c54bfef050f1a81e5526cc (diff)
downloadbootstrap-3bc7553f66482d1c8209f4644d022a05b6a8319c.tar.xz
bootstrap-3bc7553f66482d1c8209f4644d022a05b6a8319c.zip
Merge branch 'au-phiware-patch-1' into 2.0.3-wip
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less2
1 files changed, 1 insertions, 1 deletions
diff --git a/less/forms.less b/less/forms.less
index dafe1c5c3..1367b1fd9 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -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;