aboutsummaryrefslogtreecommitdiff
path: root/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 15:08:45 -0700
committerMark Otto <[email protected]>2013-07-26 15:08:45 -0700
commit1cf0a07f174261e8ee05cfd294d5147e27e22d40 (patch)
tree70588783a119ebd9871335449b7fbc029445396b /css.html
parent444973e54d56b7d722978ea398f2910fbbfe6b69 (diff)
parent2e7593a40dfc6149e81044325c6ad866dcbfa8a8 (diff)
downloadbootstrap-1cf0a07f174261e8ee05cfd294d5147e27e22d40.tar.xz
bootstrap-1cf0a07f174261e8ee05cfd294d5147e27e22d40.zip
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts: css.html
Diffstat (limited to 'css.html')
-rw-r--r--css.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/css.html b/css.html
index f49e8bb91..0401d78d0 100644
--- a/css.html
+++ b/css.html
@@ -1254,13 +1254,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3 id="forms-horizontal">Horizontal form</h3>
<p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout.</p>
<form class="bs-example form-horizontal">
- <div class="row">
+ <div class="row form-group">
<label for="inputEmail" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="inputEmail" placeholder="Email">
</div>
</div>
- <div class="row">
+ <div class="row form-group">
<label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password">
@@ -1283,7 +1283,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<input type="text" class="form-control" id="inputEmail" placeholder="Email">
</div>
</div>
- <div class="row">
+ <div class="row form-group">
<label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password">