aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-10-02 22:33:02 -0700
committerJacob Thornton <[email protected]>2011-10-02 22:33:02 -0700
commit0b625d0cb51005fd9b13c993cd7487e0b362d31a (patch)
tree266b90de67241c487a0113ea843b6f0ca48dada4
parentf8be7a805264fe35edf233303d5954a74f32f637 (diff)
parentfda10a609ce02920141e2b35504750ed9fa31a20 (diff)
downloadbootstrap-0b625d0cb51005fd9b13c993cd7487e0b362d31a.tar.xz
bootstrap-0b625d0cb51005fd9b13c993cd7487e0b362d31a.zip
Merge branch 'master' of github.com:twitter/bootstrap
-rw-r--r--js/bootstrap-tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-tabs.js b/js/bootstrap-tabs.js
index e0286a364..e8e2dc622 100644
--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@ -21,7 +21,7 @@
!function( $ ){
function activate ( element, container ) {
- container.find('.active').removeClass('active')
+ container.find('> .active').removeClass('active')
element.addClass('active')
}