aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-29 21:34:10 -0800
committerMark Otto <[email protected]>2014-01-29 21:34:10 -0800
commitd631e0b92d6ff7c6737bcedb38acc58446b3e7cc (patch)
tree120331c404af21d0f565a3a5fe3488be60056c93 /dist/css/bootstrap.css
parent545c957f1741e1a6d6916dcbf08d15f6318d5575 (diff)
downloadbootstrap-d631e0b92d6ff7c6737bcedb38acc58446b3e7cc.tar.xz
bootstrap-d631e0b92d6ff7c6737bcedb38acc58446b3e7cc.zip
Fix #12422: Reset height on multiple select in input size mixin
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css16
1 files changed, 12 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index ebcf0dcf0..22bc4c4b4 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1802,7 +1802,8 @@ select.input-sm {
height: 30px;
line-height: 30px;
}
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
height: auto;
}
.input-lg {
@@ -1816,7 +1817,8 @@ select.input-lg {
height: 46px;
line-height: 46px;
}
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
height: auto;
}
.has-feedback {
@@ -3333,7 +3335,10 @@ select.input-group-lg > .input-group-btn > .btn {
}
textarea.input-group-lg > .form-control,
textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
height: auto;
}
.input-group-sm > .form-control,
@@ -3353,7 +3358,10 @@ select.input-group-sm > .input-group-btn > .btn {
}
textarea.input-group-sm > .form-control,
textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
height: auto;
}
.input-group-addon,