diff options
| author | Mark Otto <[email protected]> | 2016-02-07 22:48:26 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-07 22:48:26 -0800 |
| commit | e455b6b8d2cd028d53640f14134f0e8b3f575786 (patch) | |
| tree | 7d3ee33ae188ac37734fb92ec1d29d695d21fd63 /scss/_forms.scss | |
| parent | e589cdbfe9421d58f6c3ff4d2820056983df6def (diff) | |
| parent | e3b55aadea895bdb0910f3ffd3f74d89fee37925 (diff) | |
| download | bootstrap-e455b6b8d2cd028d53640f14134f0e8b3f575786.tar.xz bootstrap-e455b6b8d2cd028d53640f14134f0e8b3f575786.zip | |
Merge branch 'v4-dev' into v4-form-sizing
Diffstat (limited to 'scss/_forms.scss')
| -rw-r--r-- | scss/_forms.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index aaa7ffc73..7055cad23 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -56,7 +56,7 @@ } select.form-control { - &:not([size], [multiple]) { + &:not([size]):not([multiple]) { height: $input-height; } } @@ -289,17 +289,17 @@ input[type="checkbox"] { // .form-control-success { -// background-image: url("#{$form-icon-success}"); +// background-image: $form-icon-success; // border-color: $brand-success; // } // // .form-control-warning { -// background-image: url("#{$form-icon-warning}"); +// background-image: $form-icon-warning; // border-color: $brand-warning; // } // // .form-control-error { -// background-image: url("#{$form-icon-danger}"); +// background-image: $form-icon-danger; // border-color: $brand-danger; // } |