aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-15 21:50:04 -0800
committerJacob Thornton <[email protected]>2012-01-15 21:50:04 -0800
commit036b98535711941ba64d9bb507f57ca60ec3cdc3 (patch)
tree914785a33eed6d1cc0c4ac3e9c027c2a60df720a
parent810bba97a418ae641d9360c232c1492610463dcf (diff)
downloadbootstrap-036b98535711941ba64d9bb507f57ca60ec3cdc3.tar.xz
bootstrap-036b98535711941ba64d9bb507f57ca60ec3cdc3.zip
fix margin
-rw-r--r--bootstrap.css5
-rw-r--r--bootstrap.min.css4
-rw-r--r--lib/accordion.less3
3 files changed, 5 insertions, 7 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 7a34c8d69..6e8d32be5 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 f42843638..93fbf03d4 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 ab450d10e..8485ee427 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 {