Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

This commit is contained in:
Jacob Thornton 2012-01-28 00:04:06 -08:00
commit 4a7d8de204
2 changed files with 11 additions and 0 deletions

View File

@ -861,6 +861,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-prepend input:focus,
.input-append input:focus,
.input-prepend .uneditable-input:focus,
.input-append .uneditable-input:focus {
position: relative;
z-index: 2;
}
.input-prepend .uneditable-input, .input-append .uneditable-input {
border-left-color: #ccc;
}

View File

@ -396,6 +396,10 @@ select:focus:required:invalid {
input,
.uneditable-input {
.border-radius(0 3px 3px 0);
&:focus {
position: relative;
z-index: 2;
}
}
.uneditable-input {
border-left-color: #ccc;