diff options
| author | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-07 19:47:01 -0800 |
| commit | 1bf070b4ce5ee40e4d248053d109c179bb42caf9 (patch) | |
| tree | 1a0b056458f535457f362bd8cbabfded837b5aab /docs/javascript.html | |
| parent | d8a7a380bcfd25c66ca1dc54d1619dc272f4bbb4 (diff) | |
| parent | e3f3542d0b57fdcea0fbff2858b610f85a988d1d (diff) | |
| download | bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.tar.xz bootstrap-1bf070b4ce5ee40e4d248053d109c179bb42caf9.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 896a9e8bf..f4957d91c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -785,6 +785,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) { </div> + <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> + <hr class="bs-docs-separator"> @@ -1740,7 +1743,7 @@ $('.carousel').carousel({ <li class="muted">·</li> <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> <li class="muted">·</li> - <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li> + <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li> </ul> </div> </footer> |