diff options
| author | Mark Otto <[email protected]> | 2013-07-26 15:08:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 15:08:45 -0700 |
| commit | 1cf0a07f174261e8ee05cfd294d5147e27e22d40 (patch) | |
| tree | 70588783a119ebd9871335449b7fbc029445396b | |
| parent | 444973e54d56b7d722978ea398f2910fbbfe6b69 (diff) | |
| parent | 2e7593a40dfc6149e81044325c6ad866dcbfa8a8 (diff) | |
| download | bootstrap-1cf0a07f174261e8ee05cfd294d5147e27e22d40.tar.xz bootstrap-1cf0a07f174261e8ee05cfd294d5147e27e22d40.zip | |
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts:
css.html
| -rw-r--r-- | css.html | 6 | ||||
| -rw-r--r-- | less/forms.less | 7 |
2 files changed, 4 insertions, 9 deletions
@@ -1254,13 +1254,13 @@ For example, <code><section></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><section></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"> diff --git a/less/forms.less b/less/forms.less index 390d5427a..4f04c454c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -421,13 +421,8 @@ select { // -------------------------------------------------- // Horizontal forms are built on grid classes. -.form-horizontal { - .row + .row { - margin-top: 15px; - } - .control-label { +.form-horizontal .control-label { padding-top: 6px; - } } // Only right align form labels here when the columns stop stacking |