diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61b2b03a7e..84715df6fd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -686,6 +686,7 @@ pre { code { padding: 2px 4px; color: #d14; + white-space: nowrap; background-color: #f7f7f9; border: 1px solid #e1e1e8; } @@ -1442,16 +1443,16 @@ input[type="checkbox"][readonly] { border-color: #3a87ad; } -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { +input:focus:invalid, +textarea:focus:invalid, +select:focus:invalid { color: #b94a48; border-color: #ee5f5b; } -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { +input:focus:invalid:focus, +textarea:focus:invalid:focus, +select:focus:invalid:focus { border-color: #e9322d; -webkit-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; @@ -1561,7 +1562,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; border-radius: 0; } @@ -1590,7 +1593,10 @@ select:focus:required:invalid:focus { .input-append input + .btn-group .btn, .input-append select + .btn-group .btn, -.input-append .uneditable-input + .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 { border-radius: 0 4px 4px 0; } @@ -1601,7 +1607,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 { border-radius: 0 4px 4px 0; } @@ -2798,6 +2805,7 @@ table th[class*="span"], } .typeahead { + z-index: 1051; margin-top: 2px; } @@ -2926,7 +2934,6 @@ button.close { .btn:hover { color: #333333; text-decoration: none; - background-color: #e6e6e6; background-position: 0 -15px; -webkit-transition: background-position 0.1s linear; -moz-transition: background-position 0.1s linear; @@ -2942,8 +2949,6 @@ button.close { .btn.active, .btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; background-image: none; outline: 0; -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -2953,7 +2958,6 @@ button.close { .btn.disabled, .btn[disabled] { cursor: default; - background-color: #e6e6e6; background-image: none; opacity: 0.65; filter: alpha(opacity=65); diff --git a/docs/base-css.html b/docs/base-css.html index aceb665c30..ac99d43b25 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1321,6 +1321,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>
<input class="input-xlarge" id="focusedInput" type="text" value="This is focused..."> ++ +
Style inputs via default browser functionality with :invalid
. Specify a type
and add the required
attribute.
+<input class="span3" type="email" required>
A rendered modal with header, body, and set of actions in the footer.
+<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>
<input class="input-xlarge" id="focusedInput" type="text" value="{{_i}}This is focused...{{/i}}"> ++ +
{{_i}}Style inputs via default browser functionality with :invalid
. Specify a type
and add the required
attribute.{{/i}}
+<input class="span3" type="email" required>
{{_i}}A rendered modal with header, body, and set of actions in the footer.{{/i}}