Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

This commit is contained in:
Mark Otto 2012-01-05 21:43:54 -08:00
commit 9bedfa447c
2 changed files with 1 additions and 10 deletions

View File

@ -15,15 +15,6 @@ $(function(){
// }, 0); // }, 0);
// Docs topbar nav
// ===============
$('.nav .active').on('click', function (e) {
e.preventDefault()
$(this).siblings().toggle()
});
// table sort example // table sort example
// ================== // ==================

View File

@ -74,7 +74,7 @@
* =================================== */ * =================================== */
$(function () { $(function () {
$('html').on('click.dropdown.data-api', clearMenus) $(window).on('click.dropdown.data-api', clearMenus)
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
}) })