diff options
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | js/bootstrap-tab.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index ff2f8c0b91..864e6784b9 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -486,7 +486,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <li><a href="#messages" data-toggle="tab">Messages</a></li> <li><a href="#settings" data-toggle="tab">Settings</a></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="#dropdown1" data-toggle="tab">@fat</a></li> <li><a href="#dropdown2" data-toggle="tab">@mdo</a></li> diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index c7632ded25..8492fe9558 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -77,6 +77,8 @@ if (transition) { element[0].offsetWidth // reflow for transition element.addClass('in') + } else { + element.removeClass('fade') } if ( element.parent('.dropdown-menu') ) { |