Fixes #14711: Account for list groups in collapsing panels

twbs · Oct 3, 2014 · 12091b9 · 12091b9
1 parent e7b5c4c
commit 12091b9
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 14 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -301,7 +301,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
     this.$active     =
     this.$items      = null
 
-    this.options.pause == 'hover' && this.$element
+    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
       .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/docs/_includes/js/collapse.html b/docs/_includes/js/collapse.html
@@ -105,6 +105,28 @@ <h4 class="panel-title">
 </div>
 {% endhighlight %}
 
+  <p>It's also possible to swap out <code>.panel-body</code>s with <code>.list-group</code>s.</p>
+
+  <div class="panel-group">
+    <div class="panel panel-default">
+      <div class="panel-heading" role="tab" id="collapseListGroupHeading1">
+        <h4 class="panel-title">
+          <a class="collapsed" data-toggle="collapse" href="#collapseListGroup1" aria-expanded="false" aria-controls="collapseListGroup1">
+            Collapsible list group
+          </a>
+        </h4>
+      </div>
+      <div id="collapseListGroup1" class="panel-collapse collapse" role="tabpanel" aria-labelledby="collapseListGroupHeading1">
+        <ul class="list-group">
+          <li class="list-group-item">Bootply</li>
+          <li class="list-group-item">One itmus ac facilin</li>
+          <li class="list-group-item">Second eros</li>
+        </ul>
+        <div class="panel-footer">Footer</div>
+      </div>
+    </div>
+  </div>
+
   <p>You can also use the plugin without the accordion markup. Make a button toggle the expanding and collapsing of another element.</p>
 {% highlight html %}
 <button type="button" class="btn btn-danger" data-toggle="collapse" data-target="#demo" aria-expanded="true" aria-controls="demo">

diff --git a/docs/assets/js/customize.min.js b/docs/assets/js/customize.min.js
diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
diff --git a/docs/dist/css/bootstrap.css.map b/docs/dist/css/bootstrap.css.map
diff --git a/docs/dist/css/bootstrap.min.css b/docs/dist/css/bootstrap.min.css
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
@@ -301,7 +301,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
     this.$active     =
     this.$items      = null
 
-    this.options.pause == 'hover' && this.$element
+    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
       .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }

diff --git a/docs/dist/js/bootstrap.min.js b/docs/dist/js/bootstrap.min.js
diff --git a/less/panels.less b/less/panels.less
@@ -216,17 +216,21 @@
   .panel {
     margin-bottom: 0;
     border-radius: @panel-border-radius;
+
     + .panel {
       margin-top: 5px;
     }
   }
 
   .panel-heading {
     border-bottom: 0;
-    + .panel-collapse > .panel-body {
+
+    + .panel-collapse > .panel-body,
+    + .panel-collapse > .list-group {
       border-top: 1px solid @panel-inner-border;
     }
   }
+
   .panel-footer {
     border-top: 0;
     + .panel-collapse .panel-body {