mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-01 09:22:55 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' into v4-form-sizing

Browse Source
This commit is contained in:
Mark Otto
2016-02-07 22:48:26 -08:00
parent e589cdbfe9 e3b55aadea
commit e455b6b8d2
18 changed files with 151 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scss/_forms.scss
View File

@@ -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;
// }