mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-29 23:09:05 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-02-07 22:18:53 -08:00
parent a9729c5fd0 8c7f9c66a7
commit 2aa1a4dc70
12 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/javascript.html
View File

@@ -803,6 +803,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">