diff options
| author | Mark Otto <[email protected]> | 2016-02-09 01:10:05 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-09 01:10:05 -0800 |
| commit | 371fbdb0e89a8e6d53d5abca5bb7dd2aa95726f2 (patch) | |
| tree | 9b2bc93a63027cbfd819fbdf3e96c40f34d961f7 | |
| parent | 6140be7a0998149fc790a1d62858b8541a606d47 (diff) | |
| download | bootstrap-371fbdb0e89a8e6d53d5abca5bb7dd2aa95726f2.tar.xz bootstrap-371fbdb0e89a8e6d53d5abca5bb7dd2aa95726f2.zip | |
.text-help is dead, long live .form-control-feedback
Uses a new more specific class, adds some basic spacing, and clarifies
that this class is only for validation feedback.
Clears up the help text class question in
https://github.com/twbs/bootstrap/pull/18704#issuecomment-168241731 and
addresses the vertical spacing in #18703.
| -rw-r--r-- | docs/components/forms.md | 2 | ||||
| -rw-r--r-- | scss/_forms.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/docs/components/forms.md b/docs/components/forms.md index 63dfd46b4..f1cfcd65e 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -663,6 +663,8 @@ Block help text—for below inputs or for longer lines of help text—can be eas 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. +- To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, or custom form element will receive the validation styles. +- Contextual validation text, in addition to your usual form field help text, can be added with the use of `.form-control-feedback`. This text will adapt to the parent `.has-*` class. By default it only includes a bit of `margin` for spacing and a modified `color` for each state. - Validation icons are `url()`s configured via Sass variables that are applied to `background-image` declarations for each state. - You may use your own base64 PNGs or SVGs by updating the Sass variables and recompiling. - Icons can also be disabled entirely by setting the variables to `none` or commenting out the source Sass. diff --git a/scss/_forms.scss b/scss/_forms.scss index 2614c119f..c969531fb 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -265,6 +265,10 @@ input[type="checkbox"] { // // Apply contextual and semantic states to individual form controls. +.form-control-feedback { + margin-top: .5rem; +} + .form-control-success, .form-control-warning, .form-control-danger { diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index b87429c1b..e0ab7dbca 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -5,7 +5,7 @@ @mixin form-control-validation($color) { // Color the label and help text - .text-help, + .form-control-feedback, .form-control-label, .radio, .checkbox, |