From 3d58b4622671bc51c22c857641db3b988e73632a Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 18 Feb 2012 23:29:58 -0800 Subject: fix bootstrap-button toggle regression + tests --- docs/assets/bootstrap.zip | Bin 53357 -> 53404 bytes docs/assets/js/bootstrap-button.js | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4cad194d7..9add96d32 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index a0e053547..0238ca3cb 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -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') }) }) -- cgit v1.2.3 From e145619f6dcc4387f11dd46b56262dacbeff94ed Mon Sep 17 00:00:00 2001 From: Jacob Rask Date: Sun, 19 Feb 2012 21:54:38 +0100 Subject: Remove underscore hack for IE6 IE6 does not seem to be supported by Bootstrap, and reducing the number of unused and invalid properties is always nice. --- docs/assets/bootstrap.zip | Bin 53408 -> 53402 bytes docs/assets/css/bootstrap.css | 1 - 2 files changed, 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index df4dc7ff2..2a4b69387 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 71ab7a9d4..832ea64b5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1581,7 +1581,6 @@ table .span12 { float: left; display: none; min-width: 160px; - _width: 160px; padding: 4px 0; margin: 0; list-style: none; -- cgit v1.2.3