diff options
| author | Jacob Thornton <[email protected]> | 2015-11-14 19:52:17 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2015-11-14 19:52:17 -0800 |
| commit | a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa (patch) | |
| tree | 8bbfd7e3b331fb3b5c2001de8e94c8dcceaa8162 /docs/components | |
| parent | 418f169999311d79460c1b054bdc9d68c46540b0 (diff) | |
| parent | 65b1d57386acf8793cb01e2992dd663b2c7821dd (diff) | |
| download | bootstrap-a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa.tar.xz bootstrap-a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/forms.md | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/docs/components/forms.md b/docs/components/forms.md index 031dc83a8..e274b8bb4 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas ## Validation -Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. +Bootstrap includes validation styles for danger, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, 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 %} {% callout warning %} @@ -557,33 +557,27 @@ Ensure that an alternative indication of state is also provided. For instance, y <input type="text" class="form-control form-control-warning" id="inputWarning1"> </div> <div class="form-group has-danger"> - <label class="form-control-label" for="inputError1">Input with error</label> - <input type="text" class="form-control form-control-error" id="inputError1"> + <label class="form-control-label" for="inputDanger1">Input with danger</label> + <input type="text" class="form-control form-control-danger" id="inputDanger1"> </div> -<div class="has-success"> - <div class="checkbox"> - <label> - <input type="checkbox" id="checkboxSuccess" value="option1"> - Checkbox with success - </label> - </div> +<div class="checkbox has-success"> + <label> + <input type="checkbox" id="checkboxSuccess" value="option1"> + Checkbox with success + </label> </div> -<div class="has-warning"> - <div class="checkbox"> - <label> - <input type="checkbox" id="checkboxWarning" value="option1"> - Checkbox with warning - </label> - </div> +<div class="checkbox has-warning"> + <label> + <input type="checkbox" id="checkboxWarning" value="option1"> + Checkbox with warning + </label> </div> -<div class="has-danger"> - <div class="checkbox"> - <label> - <input type="checkbox" id="checkboxError" value="option1"> - Checkbox with error - </label> - </div> +<div class="checkbox has-danger"> + <label> + <input type="checkbox" id="checkboxDanger" value="option1"> + Checkbox with danger + </label> </div> {% endexample %} |