rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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">