diff options
| author | Mark Otto <[email protected]> | 2013-08-13 11:15:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 11:15:46 -0700 |
| commit | 9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf (patch) | |
| tree | be0a197e9c3f02b5af312aa77567d8e92cac0c98 /components.html | |
| parent | d482b712e750cb7bb17e8076fb06752e3627ac4a (diff) | |
| parent | 729854fa5f41ec15061dc33a49d279ae9def942e (diff) | |
| download | bootstrap-9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf.tar.xz bootstrap-9a3aa9f1defcdf5f7a1dc0bcb9dca0f0e2d675bf.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 60 |
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"> |