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

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

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-19 14:54:53 -08:00
parent 16d12396d0 532242e626
commit adbbf17ee4
6 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

1
docs/assets/css/bootstrap.css vendored
View File

@@ -1581,7 +1581,6 @@ table .span12 {
float: left;
display: none;
min-width: 160px;
_width: 160px;
padding: 4px 0;
margin: 0;
list-style: none;

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')
})
})