mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2014-01-29 21:34:10 -08:00
parent 545c957f17
commit d631e0b92d
8 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.css
Vendored
+12 -4
View File
@@ -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 {
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 {
} }
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 {
} }
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,
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap-theme.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/mixins.less
+2 -1
View File
@@ -919,7 +919,8 @@
line-height: @input-height; line-height: @input-height;
} }
textarea& { textarea&,
select[multiple]& {
height: auto; height: auto;
} }
} }