aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 18:20:27 -0800
committerMark Otto <[email protected]>2016-02-06 18:20:27 -0800
commitcaa36b8dd723945a788b1dcb2c845ee05532155e (patch)
treebddbf9e135443a806b3a35af515dcb2db397b82f
parent365db6e3a8fd9c1bac75cf170948c946e2ed7678 (diff)
downloadbootstrap-caa36b8dd723945a788b1dcb2c845ee05532155e.tar.xz
bootstrap-caa36b8dd723945a788b1dcb2c845ee05532155e.zip
Fixes #17194: Ensure proper height on default select.form-control instances
-rw-r--r--scss/_forms.scss13
1 files changed, 5 insertions, 8 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss
index c492d1f1c..03f140906 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -21,14 +21,6 @@
@include box-shadow($input-box-shadow);
@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+.
&::-ms-expand {
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.
.form-control-file,