From 237640c70697ffa0605770dee625d9e3c6abf479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 23:36:25 -0700 Subject: [PATCH] Drop the accordion for the panel * Deletes the accordion.less file * Extends the panel to be collapsible with our JS plugin * Supports panel color variations --- components.html | 60 +++++++++++++++------ dist/css/bootstrap.css | 79 ++++++++++++++++++++++++--- dist/css/bootstrap.min.css | 2 +- dist/js/bootstrap.js | 2 +- dist/js/bootstrap.min.js | 2 +- javascript.html | 106 +++++++++++++++++++++---------------- js/collapse.js | 2 +- less/accordion.less | 31 ----------- less/bootstrap.less | 1 - less/mixins.less | 8 +++ less/panels.less | 50 ++++++++++++++--- 11 files changed, 231 insertions(+), 112 deletions(-) delete mode 100644 less/accordion.less diff --git a/components.html b/components.html index bbfcf69c6b..dd1672aa27 100644 --- a/components.html +++ b/components.html @@ -2386,12 +2386,16 @@ body { padding-bottom: 70px; }

By default, all the .panel does is apply some basic border and padding to contain some content.

- Basic panel example +
+ Basic panel example +
{% highlight html %}
- Basic panel example +
+ Basic panel example +
{% endhighlight %} @@ -2400,26 +2404,34 @@ body { padding-bottom: 70px; }
Panel heading
- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +
{% highlight html %}
Panel heading
- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +
{% endhighlight %} @@ -2427,13 +2439,17 @@ body { padding-bottom: 70px; }

Wrap buttons or secondary text in .panel-footer.

- Panel content +
+ Panel content +
{% highlight html %}
- Panel content +
+ Panel content +
{% endhighlight %} @@ -2445,31 +2461,41 @@ body { padding-bottom: 70px; }

Panel title

- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +

Panel title

- Panel content +
+ Panel content +
{% highlight html %} @@ -2486,7 +2512,9 @@ body { padding-bottom: 70px; }
Panel heading
-

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.

+
+

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.

+