diff options
| author | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 13:48:33 -0700 |
| commit | bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3 (patch) | |
| tree | 2a59b9815cb02226a694c345cf942c9ad869810f /js | |
| parent | 3c772b1cebfed73570247691917b40fcf3d95aa2 (diff) | |
| parent | a8769b8cab1799168b31f1a5afd403f323a6b6d4 (diff) | |
| download | bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.tar.xz bootstrap-bd93ed2cb6034de2f287f7508b4fd0b1d28ab0d3.zip | |
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js')
| -rw-r--r-- | js/collapse.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/collapse.js b/js/collapse.js index b20022a2e..92cc0bc76 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -48,7 +48,7 @@ this.$element.trigger(startEvent) if (startEvent.isDefaultPrevented()) return - var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var actives = this.$parent && this.$parent.find('> .panel > .in') if (actives && actives.length) { var hasData = actives.data('bs.collapse') |