aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-31 18:07:07 -0800
committerMark Otto <[email protected]>2013-01-31 18:07:07 -0800
commitfe5150d5dc17eb4331d5f73abe3d6a71588a8f0c (patch)
treee165d91de4adac5f9520baf2cf89aff8c5c3e663
parent061d2849a6384900f15cbf782e7299f215dbb087 (diff)
parentd44acb7f886f6d501105c8cf9aab78aaeeab387c (diff)
downloadbootstrap-fe5150d5dc17eb4331d5f73abe3d6a71588a8f0c.tar.xz
bootstrap-fe5150d5dc17eb4331d5f73abe3d6a71588a8f0c.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
-rw-r--r--less/carousel.less23
1 files changed, 12 insertions, 11 deletions
diff --git a/less/carousel.less b/less/carousel.less
index e175f9477..e4ef2e53a 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -158,15 +158,16 @@
padding: 40px;
text-shadow: 0 1px 2px rgba(0,0,0,.6);
max-width: 60%;
-}
-.carousel-caption h3,
-.carousel-caption p {
- color: #fff;
- line-height: @line-height-base;
-}
-.carousel-caption h3 {
- margin: 0 0 5px;
-}
-.carousel-caption p {
- margin-bottom: 0;
+
+ h3,
+ p {
+ color: #fff;
+ line-height: @line-height-base;
+ }
+ h3 {
+ margin: 0 0 5px;
+ }
+ p {
+ margin-bottom: 0;
+ }
}