diff options
| author | Chris Rebert <[email protected]> | 2015-08-29 15:55:45 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-08-29 15:55:45 -0700 |
| commit | 8ad1f8ddbe94334845ff1a6bbcaa71c526bdb074 (patch) | |
| tree | e05978739e23f480298713a9962ae632b95fafcf | |
| parent | 22a10a10963c2e22f6d9461255fdae4c1459463c (diff) | |
| parent | 5c239aae7d403a186ae87dff553978cb906fcdf7 (diff) | |
| download | bootstrap-8ad1f8ddbe94334845ff1a6bbcaa71c526bdb074.tar.xz bootstrap-8ad1f8ddbe94334845ff1a6bbcaa71c526bdb074.zip | |
Merge pull request #17331 from twbs/fix-17323
rm unused $state param from form-control-validation mixin
| -rw-r--r-- | scss/_forms.scss | 6 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index f8ffed37e..af25fcb35 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -273,7 +273,7 @@ input[type="checkbox"] { // Form validation states .has-success { - @include form-control-validation(success, $brand-success); + @include form-control-validation($brand-success); .form-control-success { background-image: url($form-icon-success); @@ -281,7 +281,7 @@ input[type="checkbox"] { } .has-warning { - @include form-control-validation(warning, $brand-warning); + @include form-control-validation($brand-warning); .form-control-warning { background-image: url($form-icon-warning); @@ -289,7 +289,7 @@ input[type="checkbox"] { } .has-error { - @include form-control-validation(error, $brand-danger); + @include form-control-validation($brand-danger); .form-control-error { background-image: url($form-icon-error); diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 764c5e083..c9f3ef1a5 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -3,7 +3,7 @@ // Used in _forms.scss to generate the form validation CSS for warnings, errors, // and successes. -@mixin form-control-validation($state, $color) { +@mixin form-control-validation($color) { // Color the label and help text .help-block, .control-label, |