mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-05-28 20:58:17 +00:00
Merge branch 'master' of github.com:twbs/bootstrap-examples
This commit is contained in:
commit
4b849e5fd7
1 changed files with 4 additions and 6 deletions
|
|
@ -15,10 +15,6 @@ body {
|
||||||
|
|
||||||
/* Special class on .container surrounding .navbar, used for positioning it into place. */
|
/* Special class on .container surrounding .navbar, used for positioning it into place. */
|
||||||
.navbar-wrapper {
|
.navbar-wrapper {
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -30,6 +26,9 @@ body {
|
||||||
/* Carousel base class */
|
/* Carousel base class */
|
||||||
.carousel {
|
.carousel {
|
||||||
margin-bottom: 60px;
|
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 */
|
/* Since positioning the image, we need to help out the caption */
|
||||||
.carousel-caption {
|
.carousel-caption {
|
||||||
|
|
@ -119,7 +118,6 @@ body {
|
||||||
/* Navbar positioning foo */
|
/* Navbar positioning foo */
|
||||||
.navbar-wrapper {
|
.navbar-wrapper {
|
||||||
margin-top: 20px;
|
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 */
|
/* The navbar becomes detached from the top, so we round the corners */
|
||||||
.navbar-wrapper .navbar {
|
.navbar-wrapper .navbar {
|
||||||
|
|
@ -133,4 +131,4 @@ body {
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue