diff options
| author | fat <[email protected]> | 2013-06-27 19:19:57 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-06-27 19:19:57 -0700 |
| commit | b06ec345ce5d84d54575bc4a127893786e95be8a (patch) | |
| tree | 14d260088e25b945d0d3a5bff3f5ac18b92041fe /docs/javascript.html | |
| parent | b0da97588e3d1e4d7eb688d16b3e40e0a27459f3 (diff) | |
| parent | cb483b67589df7ac3ece33303b8ce944b3ac4b0e (diff) | |
| download | bootstrap-b06ec345ce5d84d54575bc4a127893786e95be8a.tar.xz bootstrap-b06ec345ce5d84d54575bc4a127893786e95be8a.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 587592600..4a45886b8 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -751,9 +751,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { </ul> </div><!-- /example --> - - <h3>Tooltips in input groups</h3> - <p>When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.</p> + <div class="bs-callout"> + <h4>Tooltips in button groups and input groups require special setting</h4> + <p>When using tooltips on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).</p> + </div> <hr class="bs-docs-separator"> @@ -880,6 +881,10 @@ $('#example').tooltip(options) <h4>Plugin dependency</h4> <p>Popovers require the <a href="#tooltips">tooltip plugin</a> to be included in your version of Bootstrap.</p> </div> + <div class="bs-callout"> + <h4>Popovers in button groups and input groups require special setting</h4> + <p>When using popovers on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).</p> + </div> <h3>Static popover</h3> <p>Four options are available: top, right, bottom, and left aligned.</p> @@ -1011,7 +1016,7 @@ $('#example').tooltip(options) <td>string | false</td> <td>false</td> <td> - <p>Appends the popover to a specific element <code>container: 'body'</code></p> + <p>Appends the popover to a specific element. Example: <code>container: 'body'</code></p> </td> </tr> </tbody> |