From 48c64127b37be4a692a70cb7b38ed9744163582b Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Wed, 30 Oct 2013 16:13:42 -0400 Subject: 3.0.0 -> 3.0.1 --- .../bootstrap/examples/carousel/carousel.css | 30 +++++++++++--- .../bootstrap/examples/carousel/index.html | 48 ++++++++++++---------- 2 files changed, 51 insertions(+), 27 deletions(-) (limited to 'bower_components/bootstrap/examples/carousel') diff --git a/bower_components/bootstrap/examples/carousel/carousel.css b/bower_components/bootstrap/examples/carousel/carousel.css index 164f306e..a728bd89 100755 --- a/bower_components/bootstrap/examples/carousel/carousel.css +++ b/bower_components/bootstrap/examples/carousel/carousel.css @@ -14,8 +14,21 @@ body { /* Special class on .container surrounding .navbar, used for positioning it into place. */ .navbar-wrapper { - position: relative; - z-index: 15; + position: absolute; + top: 0; + left: 0; + right: 0; + z-index: 20; +} + +/* Flip around the padding for proper display in narrow viewports */ +.navbar-wrapper .container { + padding-left: 0; + padding-right: 0; +} +.navbar-wrapper .navbar { + padding-left: 15px; + padding-right: 15px; } @@ -24,10 +37,8 @@ body { /* Carousel base class */ .carousel { + height: 500px; margin-bottom: 60px; - - /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */ - margin-top: -90px; } /* Since positioning the image, we need to help out the caption */ .carousel-caption { @@ -103,6 +114,15 @@ body { .navbar-wrapper { margin-top: 20px; } + .navbar-wrapper .container { + padding-left: 15px; + padding-right: 15px; + } + .navbar-wrapper .navbar { + padding-left: 0; + padding-right: 0; + } + /* The navbar becomes detached from the top, so we round the corners */ .navbar-wrapper .navbar { border-radius: 4px; diff --git a/bower_components/bootstrap/examples/carousel/index.html b/bower_components/bootstrap/examples/carousel/index.html index d962c1e6..14674eeb 100755 --- a/bower_components/bootstrap/examples/carousel/index.html +++ b/bower_components/bootstrap/examples/carousel/index.html @@ -2,20 +2,24 @@ + - + Carousel Template for Bootstrap + + + @@ -65,7 +69,7 @@ -