diff options
| author | Julian Thilo <[email protected]> | 2014-01-03 11:04:14 -0800 |
|---|---|---|
| committer | Julian Thilo <[email protected]> | 2014-01-03 11:04:14 -0800 |
| commit | 71688061b40d2e1bfd39b5e16ae9ae780485d43d (patch) | |
| tree | 3a26f99deb027c98a2ce26e407a9a0c501e3d09e /docs | |
| parent | 60e6e7d4fb97242400348e7021375d361e6bad58 (diff) | |
| parent | a53779d020fb596b14621a5682007168b51a3482 (diff) | |
| download | bootstrap-71688061b40d2e1bfd39b5e16ae9ae780485d43d.tar.xz bootstrap-71688061b40d2e1bfd39b5e16ae9ae780485d43d.zip | |
Merge pull request #12080 from Quy/master
Refer to popovers instead of tooltips.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 312ca908d..3bceb6751 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1197,7 +1197,7 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <div class="bs-callout bs-callout-warning"> <h4>Multiple-line links</h4> - <p>Sometimes you want to add a tooltip to a hyperlink that wraps multiple lines. The default behavior of the tooltip plugin is to center it horizontally and vertically. Add <code>white-space: nowrap;</code> to your anchors to avoid this.</p> + <p>Sometimes you want to add a popover to a hyperlink that wraps multiple lines. The default behavior of the popover plugin is to center it horizontally and vertically. Add <code>white-space: nowrap;</code> to your anchors to avoid this.</p> </div> @@ -1234,13 +1234,13 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <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 placement 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 popover will display to the left when possible, otherwise it will display right.</td> </tr> <tr> <td>selector</td> <td>string</td> <td>false</td> - <td>if a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td> + <td>if a selector is provided, popover objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td> </tr> <tr> <td>trigger</td> |