diff options
| author | Mark Otto <[email protected]> | 2013-07-25 19:45:14 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-25 19:45:14 -0700 |
| commit | 27cedf71d58e47c291b73e078adf939014dd838c (patch) | |
| tree | eef45c6eab62bf2551e2073716f4df1e3f0a4985 /less | |
| parent | 71d3d2c3f62574bc1722d46498147cc776069c08 (diff) | |
| download | bootstrap-27cedf71d58e47c291b73e078adf939014dd838c.tar.xz bootstrap-27cedf71d58e47c291b73e078adf939014dd838c.zip | |
Update form validation states
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 6 | ||||
| -rw-r--r-- | less/mixins.less | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/less/forms.less b/less/forms.less index 0e37751ac..7040b17d6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -264,15 +264,15 @@ select { // Warning .has-warning { - .form-field-validation(@state-warning-text, @state-warning-text, @state-warning-bg); + .form-control-validation(@state-warning-text, @state-warning-text, @state-warning-bg); } // Error .has-error { - .form-field-validation(@state-danger-text, @state-danger-text, @state-danger-bg); + .form-control-validation(@state-danger-text, @state-danger-text, @state-danger-bg); } // Success .has-success { - .form-field-validation(@state-success-text, @state-success-text, @state-success-bg); + .form-control-validation(@state-success-text, @state-success-text, @state-success-bg); } diff --git a/less/mixins.less b/less/mixins.less index 260129a12..d1da6fccd 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -508,18 +508,20 @@ } } -// Framework mixins -// -------------------------------------------------- -// Generate form validation states -.form-field-validation(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { - // Color the label text +// Form validation states +// +// Used in forms.less to generate the form validation CSS for warnings, errors, +// and successes. + +.form-control-validation(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { + // Color the label and help text .help-block, .control-label { color: @text-color; } // Set the border and box shadow on specific inputs to match - .input-with-feedback { + .form-control { padding-right: 32px; // to account for the feedback icon border-color: @border-color; .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work |