diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0a825f5acb..11b0810931 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1703,7 +1703,9 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .add-on, .input-append .btn, -.input-prepend .btn { +.input-prepend .btn, +.input-append .btn-group > .dropdown-toggle, +.input-prepend .btn-group > .dropdown-toggle { vertical-align: top; -webkit-border-radius: 0; -moz-border-radius: 0; @@ -1736,9 +1738,9 @@ select:focus:required:invalid:focus { border-radius: 4px 0 0 4px; } -.input-append input + .btn-group .btn, -.input-append select + .btn-group .btn, -.input-append .uneditable-input + .btn-group .btn { +.input-append input + .btn-group .btn:last-child, +.input-append select + .btn-group .btn:last-child, +.input-append .uneditable-input + .btn-group .btn:last-child { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; @@ -1751,7 +1753,8 @@ select:focus:required:invalid:focus { } .input-append .add-on:last-child, -.input-append .btn:last-child { +.input-append .btn:last-child, +.input-append .btn-group:last-child > .dropdown-toggle { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; diff --git a/docs/base-css.html b/docs/base-css.html index dd34401d54..bd04e53d6f 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1323,6 +1323,54 @@ For example, <code><section></code> should be wrapped as inlin </ul> </div> </div> + + +
+<form> + <div class="input-prepend"> + <div class="btn-group">...</div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group">...</div> + </div> +</form>
+<form> + <div class="input-prepend"> + <div class="btn-group">...</div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group">...</div> + </div> +</form>