1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00

Merge branch 'pr/14011'

This commit is contained in:
Mark Otto
2014-07-02 22:06:32 -07:00

View File

@@ -521,6 +521,30 @@
<label class="control-label" for="inputError1">Input with error</label> <label class="control-label" for="inputError1">Input with error</label>
<input type="text" class="form-control" id="inputError1"> <input type="text" class="form-control" id="inputError1">
</div> </div>
<div class="has-success">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with success
</label>
</div>
</div>
<div class="has-warning">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with warning
</label>
</div>
</div>
<div class="has-error">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with error
</label>
</div>
</div>
</form> </form>
</div><!-- /.bs-example --> </div><!-- /.bs-example -->
{% highlight html %} {% highlight html %}
@@ -536,6 +560,30 @@
<label class="control-label" for="inputError1">Input with error</label> <label class="control-label" for="inputError1">Input with error</label>
<input type="text" class="form-control" id="inputError1"> <input type="text" class="form-control" id="inputError1">
</div> </div>
<div class="has-success">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with success
</label>
</div>
</div>
<div class="has-warning">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with warning
</label>
</div>
</div>
<div class="has-error">
<div class="checkbox">
<label>
<input type="checkbox" id="checkboxError" value="option1">
Checkbox with error
</label>
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3>With optional icons</h3> <h3>With optional icons</h3>