kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Fixes #17194: Ensure proper height on default select.form-control instances

Browse source
This commit is contained in:
Mark Otto 2016-02-06 18:20:27 -08:00
parent 365db6e3a8
commit caa36b8dd7
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scss/_forms.scss
View file

@ -21,14 +21,6 @@
@include box-shadow($input-box-shadow); @include box-shadow($input-box-shadow);
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
// Make inputs at least the height of their button counterpart (base line-height + padding + border).
// Only apply the height to textual inputs and some selects.
// &:not(textarea),
// &:not(select[size]),
// &:not(select[multiple]) {
// height: $input-height;
// }
// Unstyle the caret on `<select>`s in IE10+. // Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand { &::-ms-expand {
background-color: transparent; background-color: transparent;
@ -62,6 +54,11 @@
} }
} }
select.form-control {
&:not([size], [multiple]) {
height: $input-height;
}
}
// Make file inputs better match text inputs by forcing them to new lines. // Make file inputs better match text inputs by forcing them to new lines.
.form-control-file, .form-control-file,