aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 20:26:53 -0700
committerMark Otto <[email protected]>2013-07-26 20:26:53 -0700
commit4b849e5fd7e5df575ffc64be75816a16b2fef27f (patch)
tree888c4be800c4cb15094012d5e4ba68610cbb15e3
parent838bc9372498735412264909be2375eecac07e76 (diff)
parent36c2a34c1e3dda18edbf4e0ce8f297309d55ef6d (diff)
downloadbootstrap-4b849e5fd7e5df575ffc64be75816a16b2fef27f.tar.xz
bootstrap-4b849e5fd7e5df575ffc64be75816a16b2fef27f.zip
Merge branch 'master' of github.com:twbs/bootstrap-examples
-rw-r--r--carousel/example.css10
1 files changed, 4 insertions, 6 deletions
diff --git a/carousel/example.css b/carousel/example.css
index d31149b2e..3d997481e 100644
--- a/carousel/example.css
+++ b/carousel/example.css
@@ -15,10 +15,6 @@ body {
/* Special class on .container surrounding .navbar, used for positioning it into place. */
.navbar-wrapper {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
z-index: 10;
}
@@ -30,6 +26,9 @@ body {
/* Carousel base class */
.carousel {
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 {
@@ -119,7 +118,6 @@ body {
/* Navbar positioning foo */
.navbar-wrapper {
margin-top: 20px;
- margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
}
/* The navbar becomes detached from the top, so we round the corners */
.navbar-wrapper .navbar {
@@ -133,4 +131,4 @@ body {
line-height: 1.4;
}
-} \ No newline at end of file
+}