aboutsummaryrefslogtreecommitdiff
path: root/carousel/example.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-18 15:41:11 -0700
committerMark Otto <[email protected]>2013-07-18 15:41:11 -0700
commit36c2a34c1e3dda18edbf4e0ce8f297309d55ef6d (patch)
treeacb7f0aaa16a074b314a56e782abf8529cfd001a /carousel/example.css
parent0a1c46a12c628301f18bf5b8b394aaae1c188eb4 (diff)
parent1a2ef331fdbe0a9f1e886146eba6d750f0ea5d3d (diff)
downloadbootstrap-36c2a34c1e3dda18edbf4e0ce8f297309d55ef6d.tar.xz
bootstrap-36c2a34c1e3dda18edbf4e0ce8f297309d55ef6d.zip
Merge pull request #2 from ssorallen/master
Let .navbar-wrapper flow in Carousel example
Diffstat (limited to 'carousel/example.css')
-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
+}