diff options
| author | fat <[email protected]> | 2013-07-25 23:30:29 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-25 23:30:29 -0700 |
| commit | f58827f24d6593bc36ff48b4c58a0fd954427326 (patch) | |
| tree | 2770668c3b1fe4a6eab4d5cca7a6f713f752c800 /components.html | |
| parent | f5f04ae4a0cd57c59c782a45cca28220d5dbb3ea (diff) | |
| parent | 8a7553aeda0a99598c54637bc22954ca890cb697 (diff) | |
| download | bootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.tar.xz bootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/components.html b/components.html index 6eb849ea7..3f177a840 100644 --- a/components.html +++ b/components.html @@ -1965,18 +1965,31 @@ body { padding-bottom: 70px; } {% endhighlight %} <h3 id="panels-heading">Panel with heading</h3> - <p>Easily add a heading to your panel with <code>.panel-heading</code>. Use it on a <code><div></code> or any heading element (e.g., <code><h3></code>).</p> + <p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code><h1></code>-<code><h6></code> with a <code>.panel-title</code> class to add a pre-styled heading.</p> <div class="bs-example"> <div class="panel"> <div class="panel-heading">Panel heading</div> Panel content </div> + <div class="panel"> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> + Panel content + </div> </div> {% highlight html %} <div class="panel"> <div class="panel-heading">Panel heading</div> Panel content </div> + +<div class="panel"> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> + Panel content +</div> {% endhighlight %} <h3 id="panels-footer">Panel with footer</h3> @@ -1998,23 +2011,33 @@ body { padding-bottom: 70px; } <p>Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.</p> <div class="bs-example"> <div class="panel panel-primary"> - <div class="panel-heading">Panel heading</div> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> Panel content </div> <div class="panel panel-success"> - <div class="panel-heading">Panel heading</div> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> Panel content </div> <div class="panel panel-warning"> - <div class="panel-heading">Panel heading</div> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> Panel content </div> <div class="panel panel-danger"> - <div class="panel-heading">Panel heading</div> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> Panel content </div> <div class="panel panel-info"> - <div class="panel-heading">Panel heading</div> + <div class="panel-heading"> + <h3 class="panel-title">Panel title</h3> + </div> Panel content </div> </div> |