mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 00:54:04 +02:00
Code Issues Releases Wiki Activity

Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Browse Source 
Conflicts:
	css.html
This commit is contained in:
Mark Otto
2013-07-26 15:08:45 -07:00
parent 444973e54d 2e7593a40d
commit 1cf0a07f17
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
css.html
View File

@@ -1254,13 +1254,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<h3 id="forms-horizontal">Horizontal form</h3> <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> <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"> <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> <label for="inputEmail" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="text" class="form-control" id="inputEmail" placeholder="Email"> <input type="text" class="form-control" id="inputEmail" placeholder="Email">
</div> </div>
</div> </div>
<div class="row"> <div class="row form-group">
<label for="inputPassword" class="col-lg-2 control-label">Password</label> <label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password"> <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"> <input type="text" class="form-control" id="inputEmail" placeholder="Email">
</div> </div>
</div> </div>
<div class="row"> <div class="row form-group">
<label for="inputPassword" class="col-lg-2 control-label">Password</label> <label for="inputPassword" class="col-lg-2 control-label">Password</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="password" class="form-control" id="inputPassword" placeholder="Password"> <input type="password" class="form-control" id="inputPassword" placeholder="Password">

7
less/forms.less
View File

@@ -421,13 +421,8 @@ select {
// -------------------------------------------------- // --------------------------------------------------
// Horizontal forms are built on grid classes. // Horizontal forms are built on grid classes.
.form-horizontal { .form-horizontal .control-label {
.row + .row {
margin-top: 15px;
}
.control-label {
padding-top: 6px; padding-top: 6px;
}
} }
// Only right align form labels here when the columns stop stacking // Only right align form labels here when the columns stop stacking