diff options
| author | fat <[email protected]> | 2013-05-16 18:35:18 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-16 18:35:18 -0700 |
| commit | e74110bf4aeac89fe63cf6e73f48c36fdd00b392 (patch) | |
| tree | 86dd8b6be77ca721975f0967615a93e2ce19e172 | |
| parent | c072b6b2fc097db1fc369c377d0f0b7f7a7cf7e3 (diff) | |
| parent | d8b749a4d35b5a6f7a6ebba2bdac5651460aef27 (diff) | |
| download | bootstrap-e74110bf4aeac89fe63cf6e73f48c36fdd00b392.tar.xz bootstrap-e74110bf4aeac89fe63cf6e73f48c36fdd00b392.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/carousel.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b9940b55e..bec7260c2 100644 --- 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; diff --git a/less/carousel.less b/less/carousel.less index 43bef87e1..c1b0e9b9a 100644 --- 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; |