diff options
| author | Mark Otto <[email protected]> | 2012-02-21 13:43:13 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-21 13:43:13 -0800 |
| commit | 664a5c443849880972cf62aa85306be269d09270 (patch) | |
| tree | 238790e386bb05eb17780b8b5dbea8e1c2c9e6d7 /docs | |
| parent | d908731566a18a236609708238e697b4fc3c1355 (diff) | |
| download | bootstrap-664a5c443849880972cf62aa85306be269d09270.tar.xz bootstrap-664a5c443849880972cf62aa85306be269d09270.zip | |
update forms help-block
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53838 -> 53853 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 12 | ||||
| -rw-r--r-- | docs/base-css.html | 1 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 6fc8725b9..c6078d9fc 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 dc20a861d..d3026a294 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -855,11 +855,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ::-webkit-input-placeholder { color: #999999; } +.help-block, .help-inline { + color: #555555; +} .help-block { display: block; - margin-top: 5px; - margin-bottom: 0; - color: #999999; + margin-bottom: 9px; } .help-inline { display: inline-block; @@ -867,7 +868,6 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec /* IE7 inline-block hack */ *zoom: 1; - margin-bottom: 9px; vertical-align: middle; padding-left: 5px; } @@ -1044,6 +1044,10 @@ legend + .control-group { .form-horizontal .controls { margin-left: 160px; } +.form-horizontal .help-block { + margin-top: 9px; + margin-bottom: 0; +} .form-horizontal .form-actions { padding-left: 160px; } diff --git a/docs/base-css.html b/docs/base-css.html index 86ea85533..79ea2ac55 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -864,6 +864,7 @@ For example, <code>section</code> should be wrapped as inline. <form class="well"> <label>Label name</label> <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span> + <p class="help-block">Example block-level help text here.</p> <label class="checkbox"> <input type="checkbox"> Check me out </label> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 519f07bfe..72b09c271 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -788,6 +788,7 @@ <form class="well"> <label>{{_i}}Label name{{/i}}</label> <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span> + <p class="help-block">{{_i}}Example block-level help text here.{{/i}}</p> <label class="checkbox"> <input type="checkbox"> {{_i}}Check me out{{/i}} </label> |