diff options
| author | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
| commit | a633fc042d4060499964fca7333edc5ac55cde4b (patch) | |
| tree | 4422ee5ec858137d5b07a34e662dd1c493a6f06b /docs/javascript.html | |
| parent | cae63200d8a645f385349debd940666ddbca0b38 (diff) | |
| parent | 1facbf6e7a32cfb1334e9c84a59c762c27f13cb5 (diff) | |
| download | bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.tar.xz bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
docs/css.html
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index d7035d661..b568ff7a7 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -925,7 +925,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { <h4>Opt-in functionality</h4> <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p> </div> - <div class="bs-callout bs-callout-info"> + <div class="bs-callout bs-callout-warning"> <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> @@ -1110,7 +1110,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { <h4>Opt-in functionality</h4> <p>For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning <strong>you must initialize them yourself</strong>.</p> </div> - <div class="bs-callout bs-callout-info"> + <div class="bs-callout bs-callout-warning"> <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> |