rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #17320 from EspadaV8/form-doc-control-label

Browse Source 
Replace instances of 'control-label' with 'form-control-label'
This commit is contained in:
Mark Otto 2015-09-02 00:30:42 -07:00
commit 8e74675c16
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/components/forms.md
View File

@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas
## Validation ## Validation
Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
{% comment %} {% comment %}
{% callout warning %} {% callout warning %}
@ -549,15 +549,15 @@ Ensure that an alternative indication of state is also provided. For instance, y
{% example html %} {% example html %}
<div class="form-group has-success"> <div class="form-group has-success">
<label class="control-label" for="inputSuccess1">Input with success</label> <label class="form-control-label" for="inputSuccess1">Input with success</label>
<input type="text" class="form-control form-control-success" id="inputSuccess1"> <input type="text" class="form-control form-control-success" id="inputSuccess1">
</div> </div>
<div class="form-group has-warning"> <div class="form-group has-warning">
<label class="control-label" for="inputWarning1">Input with warning</label> <label class="form-control-label" for="inputWarning1">Input with warning</label>
<input type="text" class="form-control form-control-warning" id="inputWarning1"> <input type="text" class="form-control form-control-warning" id="inputWarning1">
</div> </div>
<div class="form-group has-error"> <div class="form-group has-error">
<label class="control-label" for="inputError1">Input with error</label> <label class="form-control-label" for="inputError1">Input with error</label>
<input type="text" class="form-control form-control-error" id="inputError1"> <input type="text" class="form-control form-control-error" id="inputError1">
</div> </div>

4
docs/components/modal.md
View File

@ -336,11 +336,11 @@ Have a bunch of buttons that all trigger the same modal, just with slightly diff
<div class="modal-body"> <div class="modal-body">
<form> <form>
<div class="form-group"> <div class="form-group">
<label for="recipient-name" class="control-label">Recipient:</label> <label for="recipient-name" class="form-control-label">Recipient:</label>
<input type="text" class="form-control" id="recipient-name"> <input type="text" class="form-control" id="recipient-name">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="message-text" class="control-label">Message:</label> <label for="message-text" class="form-control-label">Message:</label>
<textarea class="form-control" id="message-text"></textarea> <textarea class="form-control" id="message-text"></textarea>
</div> </div>
</form> </form>

2
scss/_forms.scss
View File

@ -425,7 +425,7 @@ input[type="checkbox"] {
width: 100%; width: 100%;
} }
.control-label { .form-control-label {
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }

2
scss/mixins/_forms.scss
View File

@ -6,7 +6,7 @@
@mixin form-control-validation($color) { @mixin form-control-validation($color) {
// Color the label and help text // Color the label and help text
.help-block, .help-block,
.control-label, .form-control-label,
.radio, .radio,
.checkbox, .checkbox,
.radio-inline, .radio-inline,