Commit 36c2a34c authored by Mark Otto's avatar Mark Otto

Merge pull request #2 from ssorallen/master

Let .navbar-wrapper flow in Carousel example
parents 0a1c46a1 1a2ef331
......@@ -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
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment