Skip to content

Commit ea3ed02

Browse files
committed
Reset height on select[multiple] in .input-size() mixin.
twbs/bootstrap#12422
1 parent 60bea41 commit ea3ed02

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

css/flat-ui.css

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,8 @@ select.input-sm {
12031203
height: 35px;
12041204
line-height: 35px;
12051205
}
1206-
textarea.input-sm {
1206+
textarea.input-sm,
1207+
select[multiple].input-sm {
12071208
height: auto;
12081209
}
12091210
.input-lg {
@@ -1217,7 +1218,8 @@ select.input-lg {
12171218
height: 45px;
12181219
line-height: 45px;
12191220
}
1220-
textarea.input-lg {
1221+
textarea.input-lg,
1222+
select[multiple].input-lg {
12211223
height: auto;
12221224
}
12231225
.input-hg {
@@ -1231,7 +1233,8 @@ select.input-hg {
12311233
height: 53px;
12321234
line-height: 53px;
12331235
}
1234-
textarea.input-hg {
1236+
textarea.input-hg,
1237+
select[multiple].input-hg {
12351238
height: auto;
12361239
}
12371240
.has-warning .help-block,
@@ -1454,7 +1457,10 @@ select.input-group-hg > .input-group-btn > .btn {
14541457
}
14551458
textarea.input-group-hg > .form-control,
14561459
textarea.input-group-hg > .input-group-addon,
1457-
textarea.input-group-hg > .input-group-btn > .btn {
1460+
textarea.input-group-hg > .input-group-btn > .btn,
1461+
select[multiple].input-group-hg > .form-control,
1462+
select[multiple].input-group-hg > .input-group-addon,
1463+
select[multiple].input-group-hg > .input-group-btn > .btn {
14581464
height: auto;
14591465
}
14601466
.input-group-lg > .form-control,
@@ -1474,7 +1480,10 @@ select.input-group-lg > .input-group-btn > .btn {
14741480
}
14751481
textarea.input-group-lg > .form-control,
14761482
textarea.input-group-lg > .input-group-addon,
1477-
textarea.input-group-lg > .input-group-btn > .btn {
1483+
textarea.input-group-lg > .input-group-btn > .btn,
1484+
select[multiple].input-group-lg > .form-control,
1485+
select[multiple].input-group-lg > .input-group-addon,
1486+
select[multiple].input-group-lg > .input-group-btn > .btn {
14781487
height: auto;
14791488
}
14801489
.input-group-sm > .form-control,
@@ -1494,7 +1503,10 @@ select.input-group-sm > .input-group-btn > .btn {
14941503
}
14951504
textarea.input-group-sm > .form-control,
14961505
textarea.input-group-sm > .input-group-addon,
1497-
textarea.input-group-sm > .input-group-btn > .btn {
1506+
textarea.input-group-sm > .input-group-btn > .btn,
1507+
select[multiple].input-group-sm > .form-control,
1508+
select[multiple].input-group-sm > .input-group-addon,
1509+
select[multiple].input-group-sm > .input-group-btn > .btn {
14981510
height: auto;
14991511
}
15001512
.input-group-addon {
@@ -2044,7 +2056,8 @@ select.navbar-input {
20442056
height: 35px;
20452057
line-height: 35px;
20462058
}
2047-
textarea.navbar-input {
2059+
textarea.navbar-input,
2060+
select[multiple].navbar-input {
20482061
height: auto;
20492062
}
20502063
.navbar-form {
@@ -2091,7 +2104,10 @@ select.navbar-form .btn {
20912104
}
20922105
textarea.navbar-form .form-control,
20932106
textarea.navbar-form .input-group-addon,
2094-
textarea.navbar-form .btn {
2107+
textarea.navbar-form .btn,
2108+
select[multiple].navbar-form .form-control,
2109+
select[multiple].navbar-form .input-group-addon,
2110+
select[multiple].navbar-form .btn {
20952111
height: auto;
20962112
}
20972113
.navbar-form .input-group .form-control:first-child,

less/mixins.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,8 @@
820820
line-height: @input-height;
821821
}
822822

823-
textarea& {
823+
textarea&,
824+
select[multiple]& {
824825
height: auto;
825826
}
826827
}

0 commit comments

Comments
 (0)