aboutsummaryrefslogtreecommitdiff
path: root/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-13 10:44:43 -0700
committerMark Otto <[email protected]>2013-08-13 10:44:43 -0700
commit729854fa5f41ec15061dc33a49d279ae9def942e (patch)
tree041e9e0b12b2d8904ede82aebc668fa03898f522 /components.html
parent3e373a844c7763f513d1aec13fcd5da9d4bcd1e8 (diff)
parent33a88c9a94761a0371b0b3084de9009749033067 (diff)
downloadbootstrap-729854fa5f41ec15061dc33a49d279ae9def942e.tar.xz
bootstrap-729854fa5f41ec15061dc33a49d279ae9def942e.zip
Merge pull request #9404 from twbs/bs3_drop_accordion_for_panel
BS3: Drop the accordion for the panel (fixes #8648)
Diffstat (limited to 'components.html')
-rw-r--r--components.html60
1 files changed, 45 insertions, 15 deletions
diff --git a/components.html b/components.html
index fe4cf1631..aa7ca25ed 100644
--- a/components.html
+++ b/components.html
@@ -2426,12 +2426,16 @@ body { padding-bottom: 70px; }
<p>By default, all the <code>.panel</code> does is apply some basic border and padding to contain some content.</p>
<div class="bs-example">
<div class="panel">
- Basic panel example
+ <div class="panel-body">
+ Basic panel example
+ </div>
</div>
</div>
{% highlight html %}
<div class="panel">
- Basic panel example
+ <div class="panel-body">
+ Basic panel example
+ </div>
</div>
{% endhighlight %}
@@ -2440,26 +2444,34 @@ body { padding-bottom: 70px; }
<div class="bs-example">
<div class="panel">
<div class="panel-heading">Panel heading</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
</div>
{% highlight html %}
<div class="panel">
<div class="panel-heading">Panel heading</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
{% endhighlight %}
@@ -2467,13 +2479,17 @@ body { padding-bottom: 70px; }
<p>Wrap buttons or secondary text in <code>.panel-footer</code>.</p>
<div class="bs-example">
<div class="panel">
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
<div class="panel-footer">Panel footer</div>
</div>
</div>
{% highlight html %}
<div class="panel">
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
<div class="panel-footer">Panel footer</div>
</div>
{% endhighlight %}
@@ -2485,31 +2501,41 @@ body { padding-bottom: 70px; }
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel panel-warning">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel panel-danger">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
- Panel content
+ <div class="panel-body">
+ Panel content
+ </div>
</div>
</div>
{% highlight html %}
@@ -2526,7 +2552,9 @@ body { padding-bottom: 70px; }
<div class="panel">
<!-- Default panel contents -->
<div class="panel-heading">Panel heading</div>
- <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+ <div class="panel-body">
+ <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+ </div>
<!-- List group -->
<ul class="list-group">
@@ -2542,7 +2570,9 @@ body { padding-bottom: 70px; }
<div class="panel">
<!-- Default panel contents -->
<div class="panel-heading">Panel heading</div>
- <p>...</p>
+ <div class="panel-body">
+ <p>...</p>
+ </div>
<!-- List group -->
<ul class="list-group">