diff options
| author | Mark Otto <[email protected]> | 2013-05-16 20:17:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-16 20:17:42 -0700 |
| commit | 1983ca03ec4f84bf9076d9327bc966caffda4ea6 (patch) | |
| tree | b847915f682725ea5bba12ffb8f84638272bb959 /less | |
| parent | 55a1416789c9c9f448528926016d0fa97f233578 (diff) | |
| download | bootstrap-1983ca03ec4f84bf9076d9327bc966caffda4ea6.tar.xz bootstrap-1983ca03ec4f84bf9076d9327bc966caffda4ea6.zip | |
Form validation and horizontal row update
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 10 | ||||
| -rw-r--r-- | less/mixins.less | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/less/forms.less b/less/forms.less index 4e028bf49..303c3b617 100644 --- a/less/forms.less +++ b/less/forms.less @@ -268,15 +268,15 @@ input[type="checkbox"] { // Warning .has-warning { - .formFieldState(@state-warning-text, @state-warning-text, @state-warning-bg); + .form-field-validation(@state-warning-text, @state-warning-text, @state-warning-bg); } // Error .has-error { - .formFieldState(@state-danger-text, @state-danger-text, @state-danger-bg); + .form-field-validation(@state-danger-text, @state-danger-text, @state-danger-bg); } // Success .has-success { - .formFieldState(@state-success-text, @state-success-text, @state-success-bg); + .form-field-validation(@state-success-text, @state-success-text, @state-success-bg); } // HTML5 invalid states @@ -443,14 +443,14 @@ select:focus:invalid { .row + .row { margin-top: 15px; } - .row-label { + .control-label { padding-top: 6px; } } // Only right aline form labels here when the columns stop stacking @media (min-width: 768px) { - .form-horizontal .row-label { + .form-horizontal .control-label { text-align: right; } } diff --git a/less/mixins.less b/less/mixins.less index dcba39f85..a2338c184 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -531,7 +531,7 @@ } // Generate form validation states -.formFieldState(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { +.form-field-validation(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) { // Color the label text .control-label { color: @text-color; |