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

e74110bf · fat · c072b6b2 · d8b749a4 · e74110bf · e74110bf
Commit e74110bf authored May 16, 2013 by fat
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

docs/assets/css/bootstrap.css docs/assets/css/bootstrap.css +1 -1

less/carousel.less less/carousel.less +1 -1

No files found.
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4980,7 +4980,7 @@ a.list-group-item.active > .badge,
  position: absolute;
  bottom: 20px;
  left: 50%;
-  z-index: 5;
+  z-index: 15;
  width: 100px;
  margin: 0 0 0 -50px;
  text-align: center;

--- a/less/carousel.less
+++ b/less/carousel.less
@@ -128,7 +128,7 @@
  position: absolute;
  bottom: 20px;
  left: 50%;
-  z-index: 5;
+  z-index: 15;
  width: 100px;
  margin: 0 0 0 -50px;
  list-style: none;