From b4dd2b9a10a9313bbe0863b9da279e212f8d230d Mon Sep 17 00:00:00 2001
From: Jon Stevens <latchkey@gmail.com>
Date: Sun, 15 Jan 2012 19:38:30 -0800
Subject: [PATCH 1/5] fix typo

---
 docs/base-css.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/base-css.html b/docs/base-css.html
index ccc2216c67..99a4efe3a8 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;
   ...

From 810bba97a418ae641d9360c232c1492610463dcf Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Jan 2012 21:48:58 -0800
Subject: [PATCH 2/5] make accordions little bit smoother

---
 bootstrap.css        | 11 ++++++-----
 bootstrap.min.css    |  9 +++++----
 docs/javascript.html |  7 ++++---
 lib/accordion.less   | 13 +++++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 8192b24c8a..7a34c8d69f 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: Sun Jan 15 21:48:07 PST 2012
  */
 html, body {
   margin: 0;
@@ -2942,17 +2942,18 @@ a.thumbnail:hover {
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
+  margin-bottom: 1px;
 }
 .accordion-body {
-  padding: 10px;
   margin-left: 0;
-  margin-bottom: 9px;
+}
+.accordion-inner {
+  padding: 10px;
   border: 1px solid #ddd;
   border-top: 0;
-  display: none;
 }
 .accordion .in {
-  display: block;
+  margin-bottom: 9px;
 }
 .carousel {
   position: relative;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6e348c597a..f428436385 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -514,9 +514,10 @@ 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 .in{display:block;}
+.accordion-heading{padding:5px 10px;border:1px solid #ddd;margin-bottom:1px;}
+.accordion-body{margin-left:0;}
+.accordion-inner{padding:10px;border:1px solid #ddd;border-top:0;}
+.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;}
@@ -538,4 +539,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"&darr;";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"&darr;";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/javascript.html b/docs/javascript.html
index 1a6565c399..b582b13954 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1079,6 +1079,7 @@ $('#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">
@@ -1086,7 +1087,7 @@ $('#my-alert').bind('closed', function () {
               </a>
             </dt>
             <dd id="collapseOne" class="accordion-body collapse in">
-              <p>
+              <p 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.
               </p>
             </dd>
@@ -1096,7 +1097,7 @@ $('#my-alert').bind('closed', function () {
               </a>
             </dt>
             <dd id="collapseTwo" class="accordion-body collapse">
-              <p>
+              <p class="accordion-inner">
               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>
@@ -1106,7 +1107,7 @@ $('#my-alert').bind('closed', function () {
               </a>
             </dt>
             <dd id="collapseThree" class="accordion-body collapse">
-              <p>
+              <p class="accordion-inner">
               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>
diff --git a/lib/accordion.less b/lib/accordion.less
index babbe85f92..ab450d10e3 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -4,18 +4,23 @@
 .accordion {
   padding: 0;
 }
+
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
+  margin-bottom: 1px;
 }
+
 .accordion-body {
-  padding: 10px;
   margin-left: 0;
-  margin-bottom: @baseLineHeight / 2;
+}
+
+.accordion-inner {
+  padding: 10px;
   border: 1px solid #ddd;
   border-top: 0;
-  display: none;
 }
+
 .accordion .in {
-  display: block;
+  margin-bottom: @baseLineHeight / 2;
 }

From 036b98535711941ba64d9bb507f57ca60ec3cdc3 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Jan 2012 21:50:04 -0800
Subject: [PATCH 3/5] fix margin

---
 bootstrap.css      | 5 ++---
 bootstrap.min.css  | 4 ++--
 lib/accordion.less | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 7a34c8d69f..6e8d32be50 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 21:48:07 PST 2012
+ * Date: Sun Jan 15 21:49:43 PST 2012
  */
 html, body {
   margin: 0;
@@ -2942,10 +2942,9 @@ a.thumbnail:hover {
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
-  margin-bottom: 1px;
 }
 .accordion-body {
-  margin-left: 0;
+  margin: 0 0 1px 0;
 }
 .accordion-inner {
   padding: 10px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index f428436385..93fbf03d49 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -514,8 +514,8 @@ 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;margin-bottom:1px;}
-.accordion-body{margin-left:0;}
+.accordion-heading{padding:5px 10px;border:1px solid #ddd;}
+.accordion-body{margin:0 0 1px 0;}
 .accordion-inner{padding:10px;border:1px solid #ddd;border-top:0;}
 .accordion .in{margin-bottom:9px;}
 .carousel{position:relative;line-height:1;}
diff --git a/lib/accordion.less b/lib/accordion.less
index ab450d10e3..8485ee4273 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -8,11 +8,10 @@
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
-  margin-bottom: 1px;
 }
 
 .accordion-body {
-  margin-left: 0;
+  margin: 0 0 1px 0;
 }
 
 .accordion-inner {

From 87bd0e0b88b9c5a836bfde1478839e542c74ac05 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Jan 2012 21:54:58 -0800
Subject: [PATCH 4/5] do some trickery to get borders looking right

---
 bootstrap.css      | 7 +++++--
 bootstrap.min.css  | 6 +++---
 lib/accordion.less | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 6e8d32be50..efc1343178 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 21:49:43 PST 2012
+ * Date: Sun Jan 15 21:54:32 PST 2012
  */
 html, body {
   margin: 0;
@@ -2942,14 +2942,17 @@ a.thumbnail:hover {
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
+  border-bottom: 0;
 }
 .accordion-body {
+  border-bottom: 1px solid #ddd;
   margin: 0 0 1px 0;
 }
 .accordion-inner {
   padding: 10px;
   border: 1px solid #ddd;
-  border-top: 0;
+  border-bottom: 0;
+  margin-bottom: 0;
 }
 .accordion .in {
   margin-bottom: 9px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 93fbf03d49..95229b2d97 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -514,9 +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{margin:0 0 1px 0;}
-.accordion-inner{padding:10px;border:1px solid #ddd;border-top:0;}
+.accordion-heading{padding:5px 10px;border:1px solid #ddd;border-bottom:0;}
+.accordion-body{border-bottom:1px solid #ddd;margin:0 0 1px 0;}
+.accordion-inner{padding:10px;border:1px solid #ddd;border-bottom:0;margin-bottom:0;}
 .accordion .in{margin-bottom:9px;}
 .carousel{position:relative;line-height:1;}
 .carousel-inner{overflow:hidden;width:100%;position:relative;}
diff --git a/lib/accordion.less b/lib/accordion.less
index 8485ee4273..c5fd657e02 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -8,16 +8,19 @@
 .accordion-heading {
   padding: 5px 10px;
   border: 1px solid #ddd;
+  border-bottom: 0;
 }
 
 .accordion-body {
+  border-bottom: 1px solid #ddd;
   margin: 0 0 1px 0;
 }
 
 .accordion-inner {
   padding: 10px;
   border: 1px solid #ddd;
-  border-top: 0;
+  border-bottom: 0;
+  margin-bottom: 0;
 }
 
 .accordion .in {

From 7ec4e91324e6e490291f3de22e1127c4fa55f82a Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 15 Jan 2012 21:58:45 -0800
Subject: [PATCH 5/5] reorder properties

---
 bootstrap.css      | 6 +++---
 bootstrap.min.css  | 4 ++--
 lib/accordion.less | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index efc1343178..8b82efd579 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 21:54:32 PST 2012
+ * Date: Sun Jan 15 21:58:40 PST 2012
  */
 html, body {
   margin: 0;
@@ -2945,14 +2945,14 @@ a.thumbnail:hover {
   border-bottom: 0;
 }
 .accordion-body {
-  border-bottom: 1px solid #ddd;
   margin: 0 0 1px 0;
+  border-bottom: 1px solid #ddd;
 }
 .accordion-inner {
   padding: 10px;
+  margin-bottom: 0;
   border: 1px solid #ddd;
   border-bottom: 0;
-  margin-bottom: 0;
 }
 .accordion .in {
   margin-bottom: 9px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 95229b2d97..a3e2b35460 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -515,8 +515,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .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;border-bottom:0;}
-.accordion-body{border-bottom:1px solid #ddd;margin:0 0 1px 0;}
-.accordion-inner{padding:10px;border:1px solid #ddd;border-bottom:0;margin-bottom:0;}
+.accordion-body{margin:0 0 1px 0;border-bottom:1px solid #ddd;}
+.accordion-inner{padding:10px;margin-bottom:0;border:1px solid #ddd;border-bottom:0;}
 .accordion .in{margin-bottom:9px;}
 .carousel{position:relative;line-height:1;}
 .carousel-inner{overflow:hidden;width:100%;position:relative;}
diff --git a/lib/accordion.less b/lib/accordion.less
index c5fd657e02..7bd0b8278e 100644
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -12,15 +12,15 @@
 }
 
 .accordion-body {
-  border-bottom: 1px solid #ddd;
   margin: 0 0 1px 0;
+  border-bottom: 1px solid #ddd;
 }
 
 .accordion-inner {
   padding: 10px;
+  margin-bottom: 0;
   border: 1px solid #ddd;
   border-bottom: 0;
-  margin-bottom: 0;
 }
 
 .accordion .in {