aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-14 20:56:50 -0700
committerMark Otto <[email protected]>2012-04-14 20:56:50 -0700
commit490eb1bd16177f951b7c66c364d2eee6a6288a5d (patch)
tree09696f471d2cd44fbaa9ce267b74fbf578f89ec5 /docs
parent3bc7553f66482d1c8209f4644d022a05b6a8319c (diff)
downloadbootstrap-490eb1bd16177f951b7c66c364d2eee6a6288a5d.tar.xz
bootstrap-490eb1bd16177f951b7c66c364d2eee6a6288a5d.zip
fix #3068: compile after changing comment
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin71319 -> 71251 bytes
-rw-r--r--docs/assets/css/bootstrap.css2
2 files changed, 0 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 2be92692f..0fd350f5b 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b5ff8ee41..131e6671e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1205,8 +1205,6 @@ 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;