diff options
| author | Mark Otto <[email protected]> | 2012-03-22 17:36:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-22 17:36:32 -0700 |
| commit | b7b84c7a0dfaad5134258b5a50e8d42bd0656b81 (patch) | |
| tree | cc6f1c4aa7717341b7c7608cd1ad72fba135c230 /docs | |
| parent | ceab161324119c1392e8c26b68d2a14c32d43ab8 (diff) | |
| download | bootstrap-b7b84c7a0dfaad5134258b5a50e8d42bd0656b81.tar.xz bootstrap-b7b84c7a0dfaad5134258b5a50e8d42bd0656b81.zip | |
remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55567 -> 55573 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | docs/base-css.html | 3 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 3 |
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 4a90bab80..82d184fdc 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7e39e62a1..825c764f3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -992,6 +992,7 @@ select:focus:required:invalid:focus { .input-append select, .input-prepend .uneditable-input, .input-append .uneditable-input { + margin-bottom: 0; *margin-left: 0; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; diff --git a/docs/base-css.html b/docs/base-css.html index d44b65891..76b13b783 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1639,8 +1639,7 @@ For example, <code>section</code> should be wrapped as inline. <label class="control-label" for="inputIcon">Email address</label> <div class="controls"> <div class="input-prepend"> - <span class="add-on"><i class="icon-envelope"></i></span> - <input class="span2" id="inputIcon" type="text"> + <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text"> </div> </div> </div> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9b2964d74..b463462bc 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1563,8 +1563,7 @@ <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label> <div class="controls"> <div class="input-prepend"> - <span class="add-on"><i class="icon-envelope"></i></span> - <input class="span2" id="inputIcon" type="text"> + <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text"> </div> </div> </div> |