diff options
| author | Jacob Thornton <[email protected]> | 2012-01-28 00:04:06 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-28 00:04:06 -0800 |
| commit | 4a7d8de204b0d55a62935e01937fd12a8d32be21 (patch) | |
| tree | 1b72db9062b988a8f31f32066c522ce296d6e0f4 | |
| parent | 3451dcbc2816e86fc649d30bd9d6813ef5466b58 (diff) | |
| parent | ce69b70719581f87e2542710fa92fa4163acefc7 (diff) | |
| download | bootstrap-4a7d8de204b0d55a62935e01937fd12a8d32be21.tar.xz bootstrap-4a7d8de204b0d55a62935e01937fd12a8d32be21.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 7 | ||||
| -rw-r--r-- | less/forms.less | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7be53d91f..7a5568041 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; } diff --git a/less/forms.less b/less/forms.less index c7342626f..b8cb48b48 100644 --- a/less/forms.less +++ b/less/forms.less @@ -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; |