Commit d631e0b9 authored by Mark Otto's avatar Mark Otto

Fix #12422: Reset height on multiple select in input size mixin

parent 545c957f
This diff was suppressed by a .gitattributes entry.
...@@ -1802,7 +1802,8 @@ select.input-sm { ...@@ -1802,7 +1802,8 @@ select.input-sm {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
} }
textarea.input-sm { textarea.input-sm,
select[multiple].input-sm {
height: auto; height: auto;
} }
.input-lg { .input-lg {
...@@ -1816,7 +1817,8 @@ select.input-lg { ...@@ -1816,7 +1817,8 @@ select.input-lg {
height: 46px; height: 46px;
line-height: 46px; line-height: 46px;
} }
textarea.input-lg { textarea.input-lg,
select[multiple].input-lg {
height: auto; height: auto;
} }
.has-feedback { .has-feedback {
...@@ -3333,7 +3335,10 @@ select.input-group-lg > .input-group-btn > .btn { ...@@ -3333,7 +3335,10 @@ select.input-group-lg > .input-group-btn > .btn {
} }
textarea.input-group-lg > .form-control, textarea.input-group-lg > .form-control,
textarea.input-group-lg > .input-group-addon, 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; height: auto;
} }
.input-group-sm > .form-control, .input-group-sm > .form-control,
...@@ -3353,7 +3358,10 @@ select.input-group-sm > .input-group-btn > .btn { ...@@ -3353,7 +3358,10 @@ select.input-group-sm > .input-group-btn > .btn {
} }
textarea.input-group-sm > .form-control, textarea.input-group-sm > .form-control,
textarea.input-group-sm > .input-group-addon, 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; height: auto;
} }
.input-group-addon, .input-group-addon,
......
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -919,7 +919,8 @@ ...@@ -919,7 +919,8 @@
line-height: @input-height; line-height: @input-height;
} }
textarea& { textarea&,
select[multiple]& {
height: auto; height: auto;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment