mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.0.2-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
2012-02-18 23:31:37 -08:00
parent 1948e985a3 3d58b46226
commit ac6e667ad9
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

4
docs/assets/js/bootstrap-button.js vendored
View File

@@ -91,7 +91,9 @@
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
$(e.currentTarget).button('toggle')
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
})