diff --git a/bootstrap.css b/bootstrap.css
index 8192b24c8ae57d54ee7ebad7e0f9772280e353b8..acd0ae5c88129b30a43c65e3e34268cbf33893f0 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Jan 15 18:32:40 PST 2012
+ * Date: Mon Jan 16 16:01:19 PST 2012
*/
html, body {
margin: 0;
@@ -2939,17 +2939,25 @@ a.thumbnail:hover {
.accordion {
padding: 0;
}
+.accordion-group {
+ margin-bottom: 9px;
+ background-color: #eee;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+}
.accordion-heading {
- padding: 5px 10px;
- border: 1px solid #ddd;
+ display: block;
+ padding: 9px 15px;
}
.accordion-body {
- padding: 10px;
- margin-left: 0;
- margin-bottom: 9px;
- border: 1px solid #ddd;
- border-top: 0;
display: none;
+ padding: 15px;
+ margin-left: 0;
+ border-top: 1px solid #ddd;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
}
.accordion .in {
display: block;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6e348c597a98718bb5c1d9d0923fdbdac775273d..93b85abc1a57e59668ba2f2e57af847775584597 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -514,8 +514,9 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.progress.info .bar{background-color:#339bb9;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
.progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
.accordion{padding:0;}
-.accordion-heading{padding:5px 10px;border:1px solid #ddd;}
-.accordion-body{padding:10px;margin-left:0;margin-bottom:9px;border:1px solid #ddd;border-top:0;display:none;}
+.accordion-group{margin-bottom:9px;background-color:#eee;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{display:block;padding:9px 15px;}
+.accordion-body{display:none;padding:15px;margin-left:0;border-top:1px solid #ddd;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}
.accordion .in{display:block;}
.carousel{position:relative;line-height:1;}
.carousel-inner{overflow:hidden;width:100%;position:relative;}
diff --git a/docs/base-css.html b/docs/base-css.html
index ccc2216c678d7648cd49d7880b52a957898855f1..3ba3e4525df9e0a94e5a9755588fdd3283095c39 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -81,7 +81,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/docs/components.html b/docs/components.html
index 1343a4279d7be325a74fd09fbc7d0ebdc8535c5b..dd7f098b5f6ae66d65bc5f12f504de684ccddbe9 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -81,7 +81,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/docs/index.html b/docs/index.html
index 62931daac19c8045c4aa8f935d072d41fcc17138..c30417c8f5c1b7ae119f562176547c5583fbdf7d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -82,7 +82,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/docs/javascript.html b/docs/javascript.html
index 1a6565c3991e644fab186685f66b2db2204028ef..543578426600d38cb9c8b14d8e89a0cfb64c57c3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -82,7 +82,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
@@ -151,7 +151,7 @@
<div class="span3">
<label>
<h3><a href="./javascript.html#tooltips">Tooltips</a><input checked="true" value="bootstrap-tooltip.js" type="checkbox"></h3>
- <p>A new take on the jQuery Tipsy plugin, Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.</p>
+ <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, uss CSS3 for animations, and data-attributes for local title storage.</p>
</label>
</div>
<div class="span3">
@@ -196,7 +196,7 @@
<div class="span3">
<label>
<h3><a href="./javascript.html#transitions">Transitions</a> <small class="muted">*</small><input value="bootstrap-transition.js" checked="true" type="checkbox"></h3>
- <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alert messages.</p>
+ <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
<p class="muted"><strong>*</strong> Required for animation in plugins</p>
</label>
</div>
@@ -1079,38 +1079,43 @@ $('#my-alert').bind('closed', function () {
<div class="span9 columns">
<h2>Example accordion</h2>
<p>Using the collapse plugin, we built a simple accordion style widget:</p>
- <dl class="accordion" id="accordion">
- <dt class="accordion-heading">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
- Collapsible Group Item #1
+
+ <div class="accordion">
+ <div class="accordion-group">
+ <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+ Collapsible group #1
</a>
- </dt>
- <dd id="collapseOne" class="accordion-body collapse in">
- <p>
- Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
- </p>
- </dd>
- <dt class="accordion-heading">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
- Collapsible Group Item #2
+ <div class="accordion-body collapse in" id="collapseOne">
+ <h5>Lorem ipsum</h5>
+ <p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p>
+ <p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p>
+ <p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p>
+ </div>
+ </div>
+ <div class="accordion-group">
+ <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+ Collapsible group #2
</a>
- </dt>
- <dd id="collapseTwo" class="accordion-body collapse">
- <p>
- Blog +1 eiusmod, williamsburg chambray craft beer brooklyn. Trust fund squid whatever, sunt hoodie skateboard mustache 3 wolf moon art party wes anderson ad leggings officia. Skateboard keytar incididunt gluten-free retro sartorial, single-origin coffee et viral. Art party blog sunt, readymade fugiat 8-bit aesthetic ex echo park fanny pack keytar. Thundercats sustainable labore, mustache adipisicing tattooed dolore aute occaecat velit 8-bit raw denim letterpress. In occaecat freegan, next level single-origin coffee chambray excepteur nihil duis exercitation adipisicing ex sartorial twee squid. You probably haven't heard of them fugiat ea retro eiusmod quis cosby sweater, +1 fap sapiente biodiesel banksy.
- </p>
- </dd>
- <dt class="accordion-heading">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
- Collapsible Group Item #3
+ <div class="accordion-body collapse" id="collapseTwo">
+ <h5>Lorem ipsum</h5>
+ <p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p>
+ <p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p>
+ <p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p>
+ </div>
+ </div>
+ <div class="accordion-group">
+ <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+ Collapsible group #3
</a>
- </dt>
- <dd id="collapseThree" class="accordion-body collapse">
- <p>
- Tempor gentrify pariatur nihil salvia, irony synth incididunt odio commodo brunch aute. Four loko est vice echo park wes anderson jean shorts, tempor ea vero locavore. Seitan DIY dolore readymade williamsburg viral. Dolor fap master cleanse delectus, ad butcher labore duis vice mollit cillum exercitation eu banh mi. Austin banksy 3 wolf moon locavore sed, helvetica next level VHS you probably haven't heard of them ethical odio. Incididunt locavore minim, do seitan consequat qui thundercats labore before they sold out retro laborum. Esse twee readymade laboris fap vice, voluptate DIY.
- </p>
- </dd>
- </dl>
+ <div class="accordion-body collapse" id="collapseThree">
+ <h5>Lorem ipsum</h5>
+ <p>Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod.</p>
+ <p>Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et.</p>
+ <p>Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.</p>
+ </div>
+ </div>
+ </div>
+
<hr>
<h2>Using bootstrap-collapse.js</h2>
<p>Enable via javascript:</p>
diff --git a/docs/less.html b/docs/less.html
index 357f242b108f1fe647fcdccbbaded12971ca0aa1..6e43d95bd150862e5741af207e7510d004163d23 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -81,7 +81,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index eab6fedf522d023a17113572815520415cc36eff..77b94d8ce3d63f4e23730e5765a6abcd37031c68 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -81,7 +81,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index e1b9f204e3e672f7aa6acf0200a78bbd144276c8..42521bb9a87a9a0c81956b126e99f40e7f72c962 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -81,7 +81,7 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="./javascript.html#transitions">Transition</a></li>
+ <li><a href="./javascript.html#javascript">Overview</a></li>
<li><a href="./javascript.html#modals">Modal</a></li>
<li><a href="./javascript.html#dropdowns">Dropdown</a></li>
<li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
diff --git a/lib/accordion.less b/lib/accordion.less
index babbe85f929f0800264af1996a7b665d1def240b..25e8fec631d128bfdcb69e1d0a62e9320f63e725 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -4,17 +4,21 @@
.accordion {
padding: 0;
}
+.accordion-group {
+ margin-bottom: @baseLineHeight / 2;
+ background-color: #eee;
+ .border-radius(4px);
+}
.accordion-heading {
- padding: 5px 10px;
- border: 1px solid #ddd;
+ display: block;
+ padding: 9px 15px;
}
.accordion-body {
- padding: 10px;
- margin-left: 0;
- margin-bottom: @baseLineHeight / 2;
- border: 1px solid #ddd;
- border-top: 0;
display: none;
+ padding: 15px;
+ margin-left: 0;
+ border-top: 1px solid #ddd;
+ .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
}
.accordion .in {
display: block;