1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 08:34:08 +02:00

Merge pull request #2138 from laczoka/2.0.2-wip

Fix for #2137, adding select to input append/prepend
This commit is contained in:
Mark Otto
2012-02-21 08:29:08 -08:00

View File

@@ -361,6 +361,7 @@ select:focus:required:invalid {
margin-bottom: 5px; margin-bottom: 5px;
.clearfix(); // Clear the float to prevent wrapping .clearfix(); // Clear the float to prevent wrapping
input, input,
select,
.uneditable-input { .uneditable-input {
.border-radius(0 3px 3px 0); .border-radius(0 3px 3px 0);
&:focus { &:focus {
@@ -400,6 +401,7 @@ select:focus:required:invalid {
} }
.input-append { .input-append {
input, input,
select
.uneditable-input { .uneditable-input {
float: left; float: left;
.border-radius(3px 0 0 3px); .border-radius(3px 0 0 3px);