diff options
| author | Mark Otto <[email protected]> | 2013-07-27 11:26:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-27 11:26:28 -0700 |
| commit | 57bc65f7f8a7f763f10c1272fd6256da1f3926b1 (patch) | |
| tree | 46fc9f68e150cc322cc5a4e7ec6cf2ed69a976c4 | |
| parent | 1fb1c40aba44029611e412912867a99d88ff432a (diff) | |
| parent | 273a388995424e0fe917ee83026c042aa4f83673 (diff) | |
| download | bootstrap-57bc65f7f8a7f763f10c1272fd6256da1f3926b1.tar.xz bootstrap-57bc65f7f8a7f763f10c1272fd6256da1f3926b1.zip | |
Merge pull request #8650 from loic/3.0.0-wip
Fixed minor typos in css.html
| -rw-r--r-- | css.html | 4 | ||||
| -rw-r--r-- | javascript.html | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1466,7 +1466,7 @@ For example, <code><section></code> should be wrapped as inline. <div class="bs-callout bs-callout-danger"> <h4>Cross-browser compatibility</h4> - <p>While Bootstrap will apply these styles in all browsers, IE and Safari don't actually support the <code><disabled></code> attribute on a <code><fieldset></code>. Use custom JavaScript to disable the fieldset in these browsers.</p> + <p>While Bootstrap will apply these styles in all browsers, IE and Safari don't actually support the <code>disabled</code> attribute on a <code><fieldset></code>. Use custom JavaScript to disable the fieldset in these browsers.</p> </div> <form class="bs-example form-inline"> @@ -1534,7 +1534,7 @@ For example, <code><section></code> should be wrapped as inline. <h2 id="forms-input-groups">Input groups</h3> - <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.add-on</code> to prepend or append elements to an <code><input></code>.</p> + <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.input-group-addon</code> to prepend or append elements to an <code><input></code>.</p> <div class="bs-callout bs-callout-danger"> <h4>Cross-browser compatibility</h4> diff --git a/javascript.html b/javascript.html index c105a4254..10e469b44 100644 --- a/javascript.html +++ b/javascript.html @@ -790,7 +790,7 @@ $('#example').tooltip(options) <td>placement</td> <td>string | function</td> <td>'top'</td> - <td>how to position the tooltip - top | bottom | left | right | auto. <br> When "auto" is specified, it will dynamically reorient the tooltip. For example, if placment is "auto left", the tooltip will display to the left when possible, otherwise it will display right.</td> + <td>how to position the tooltip - top | bottom | left | right | auto. <br> When "auto" is specified, it will dynamically reorient the tooltip. For example, if placement is "auto left", the tooltip will display to the left when possible, otherwise it will display right.</td> </tr> <tr> <td>selector</td> @@ -1012,7 +1012,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { <td>placement</td> <td>string | function</td> <td>'right'</td> - <td>how to position the popover - top | bottom | left | right | auto.<br> When "auto" is specified, it will dynamically reorient the popover. For example, if placment is "auto left", the tooltip will display to the left when possible, otherwise it will display right.</td> + <td>how to position the popover - top | bottom | left | right | auto.<br> When "auto" is specified, it will dynamically reorient the popover. For example, if placement is "auto left", the tooltip will display to the left when possible, otherwise it will display right.</td> </tr> <tr> <td>selector</td> |