diff options
| author | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-07 22:18:53 -0800 |
| commit | 2aa1a4dc706606e060525907574bb648b773f312 (patch) | |
| tree | baccd787bdbcf45a235c3a042c1510730a24b420 /docs/templates/pages/javascript.mustache | |
| parent | a9729c5fd003abbfa0d1ab5bc318a069fd5b1382 (diff) | |
| parent | 8c7f9c66a7d12f47f50618ef420868fe836d0c33 (diff) | |
| download | bootstrap-2aa1a4dc706606e060525907574bb648b773f312.tar.xz bootstrap-2aa1a4dc706606e060525907574bb648b773f312.zip | |
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/templates/pages/javascript.mustache')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index e33e63aa4..7dd97087b 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -736,6 +736,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </div>{{! /example }} + <h3>{{_i}}Tooltips in input groups{{/i}}</h3> + <p>{{_i}}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.{{/i}}</p> + <hr class="bs-docs-separator"> |