Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less

5 files changed, 60 insertions, 55 deletions

diff --git a/bootstrap.css b/bootstrap.css
index acd0ae5c8..9d3f9d9b6 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: Mon Jan 16 16:01:19 PST 2012
+ * Date: Tue Jan 17 23:17:49 PST 2012
  */
 html, body {
   margin: 0;
@@ -2940,27 +2940,24 @@ a.thumbnail:hover {
   padding: 0;
 }
 .accordion-group {
-  margin-bottom: 9px;
-  background-color: #eee;
+  background-color: #f5f5f5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
 .accordion-heading {
-  display: block;
-  padding: 9px 15px;
+  padding: 8px 15px;
+  border-bottom: 0;
 }
 .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);
+  margin: 0 0 2px;
+}
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
 }
 .accordion .in {
-  display: block;
+  margin-bottom: 9px;
 }
 .carousel {
   position: relative;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 93b85abc1..09ecc6663 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -514,10 +514,11 @@ 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-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;}
+.accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{padding:8px 15px;border-bottom:0;}
+.accordion-body{margin:0 0 2px;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.accordion .in{margin-bottom:9px;}
 .carousel{position:relative;line-height:1;}
 .carousel-inner{overflow:hidden;width:100%;position:relative;}
 .carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
diff --git a/docs/base-css.html b/docs/base-css.html
index 3ba3e4525..1d64a5787 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -623,7 +623,7 @@
   <h3>1. Default table styles</h3>
   <div class="row">
     <div class="span4">
-      <p>Tables are automatically styled with only the a few borders to ensure readability and maintain structure. No classes are required.</p>
+      <p>Tables are automatically styled with only a few borders to ensure readability and maintain structure. No classes are required.</p>
 <pre class="prettyprint linenums">
 &lt;table&gt;
   ...
diff --git a/docs/javascript.html b/docs/javascript.html
index 543578426..34dfc1c4b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1079,43 +1079,47 @@ $('#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>
-
-          <div class="accordion">
+        
+          <div class="accordion2" id="accordion2">
             <div class="accordion-group">
-              <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                Collapsible group #1
-              </a>
-              <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 class="accordion-heading">
+                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+                  Collapsible Group Item #1
+                </a>
+              </div>
+              <div id="collapseOne" class="accordion-body collapse in">
+                <div class="accordion-inner">
+                  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.
+                </div>
               </div>
             </div>
             <div class="accordion-group">
-              <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
-                Collapsible group #2
-              </a>
-              <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 class="accordion-heading">
+                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+                  Collapsible Group Item #2
+                </a>
+              </div>
+              <div id="collapseTwo" class="accordion-body collapse">
+                <div class="accordion-inner">
+                  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.
+                </div>
               </div>
             </div>
             <div class="accordion-group">
-              <a class="accordion-heading" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                Collapsible group #3
-              </a>
-              <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 class="accordion-heading">
+                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
+                  Collapsible Group Item #3
+                </a>
+              </div>
+              <div id="collapseThree" class="accordion-body collapse">
+                <div class="accordion-inner">
+                  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.
+                </div>
               </div>
             </div>
           </div>
 
+          
           <hr>
           <h2>Using bootstrap-collapse.js</h2>
           <p>Enable via javascript:</p>
diff --git a/lib/accordion.less b/lib/accordion.less
index 25e8fec63..b7542b18f 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -2,24 +2,27 @@
 // ---------
 
 .accordion {
-  padding: 0;
+  margin-bottom: @baseLineHeight;
 }
+
 .accordion-group {
-  margin-bottom: @baseLineHeight / 2;
-  background-color: #eee;
+  background-color: #f5f5f5;
   .border-radius(4px);
 }
 .accordion-heading {
-  display: block;
-  padding: 9px 15px;
+  padding: 8px 15px;
+  border-bottom: 0;
 }
+
 .accordion-body {
-  display: none;
-  padding: 15px;
-  margin-left: 0;
-  border-top: 1px solid #ddd;
-  .box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+  margin: 0 0 2px;
 }
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
 .accordion .in {
-  display: block;
+  margin-bottom: @baseLineHeight / 2;
 }