reorder properties

diff --git a/bootstrap.css b/bootstrap.css
index efc134317873453bd715c9b0769687b56456d35b..8b82efd57939778bef83d75a4284855cc424b087 100644 (file)
--- 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 95229b2d9708aa0b34232bef8fe7f6d482a79ab9..a3e2b354607d68567ce3d140911a64493d85e8f1 100644 (file)
--- 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 c5fd657e02062035d11bc8d1e0df110d1360bc1c..7bd0b8278edb1a7eae9ffd08f70e6ef0793dad7f 100644 (file)
--- 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 {