0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00

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

This commit is contained in:
Mark Otto 2013-01-31 18:07:07 -08:00
commit fe5150d5dc

View File

@ -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;
}
} }