Commit fe5150d5 authored by Mark Otto's avatar Mark Otto

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents 061d2849 d44acb7f
...@@ -158,15 +158,16 @@ ...@@ -158,15 +158,16 @@
padding: 40px; padding: 40px;
text-shadow: 0 1px 2px rgba(0,0,0,.6); text-shadow: 0 1px 2px rgba(0,0,0,.6);
max-width: 60%; max-width: 60%;
}
.carousel-caption h3, h3,
.carousel-caption p { p {
color: #fff; color: #fff;
line-height: @line-height-base; line-height: @line-height-base;
} }
.carousel-caption h3 { h3 {
margin: 0 0 5px; margin: 0 0 5px;
} }
.carousel-caption p { p {
margin-bottom: 0; margin-bottom: 0;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment