aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-27 18:43:54 -0700
committerMark Otto <[email protected]>2013-06-27 18:43:54 -0700
commit7636577681fa07f4c3911c27a0617f4d137580ea (patch)
tree2bd804701048ddbc570ed088fb61188f7a510fe3 /docs/javascript.html
parentc9ccbd2cf0b5b37fe67e55a93223d4836f22da44 (diff)
parentcb29ed07518402c2f3ad9fbf71ed1297846727b2 (diff)
downloadbootstrap-7636577681fa07f4c3911c27a0617f4d137580ea.tar.xz
bootstrap-7636577681fa07f4c3911c27a0617f4d137580ea.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.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index d1c987904..7049e7669 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -744,9 +744,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">
@@ -873,6 +874,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>
@@ -1004,7 +1009,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>