fix up carousel alignment and line-height

3 files changed, 21 insertions, 4 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6e2ab728c..5af92fad1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5298,16 +5298,25 @@ a.badge:hover {
   right: 0;
   bottom: 0;
   left: 0;
-  padding: 10px 15px 5px;
+  padding: 15px;
   background: #333333;
   background: rgba(0, 0, 0, 0.75);
 }
 
 .carousel-caption h4,
 .carousel-caption p {
+  line-height: 20px;
   color: #ffffff;
 }
 
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
 .hero-unit {
   padding: 60px;
   margin-bottom: 30px;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e84d118d1..fd2a01d46 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -547,10 +547,10 @@ h2 + .row {
   font-size: 13px;
   line-height: 18px;
 }
-.bs-docs-example p {
+.bs-docs-example > p {
   margin-bottom: 9px;
 }
-.bs-docs-example p:last-child {
+.bs-docs-example > p:last-child {
   margin-bottom: 0;
 }
 .bs-docs-example .table,
diff --git a/less/carousel.less b/less/carousel.less
index 01675af72..33f98ac4d 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -105,6 +105,7 @@
   }
 }
 
+
 // Caption for text below images
 // -----------------------------
 
@@ -113,11 +114,18 @@
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 10px 15px 5px;
+  padding: 15px;
   background: @grayDark;
   background: rgba(0,0,0,.75);
 }
 .carousel-caption h4,
 .carousel-caption p {
   color: @white;
+  line-height: @baseLineHeight;
+}
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+.carousel-caption p {
+  margin-bottom: 0;
 }