From 87bd0e0b88b9c5a836bfde1478839e542c74ac05 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Jan 2012 21:54:58 -0800 Subject: [PATCH] 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 {