rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel

Browse Source
This commit is contained in:
Mark Otto 2013-04-01 13:17:31 -07:00
commit 8454d07372
1 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
carousel.html
View File

@ -30,30 +30,6 @@ body {
margin-top: 20px; margin-top: 20px;
margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */ margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
} }
.navbar-wrapper .navbar {
}
/* Remove border and change up box shadow for more contrast */
.navbar .navbar-inner {
border: 0;
-webkit-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-moz-box-shadow: 0 2px 10px rgba(0,0,0,.25);
box-shadow: 0 2px 10px rgba(0,0,0,.25);
}
/* Downsize the brand/project name a bit */
.navbar .brand {
padding: 14px 20px 16px; /* Increase vertical padding to match navbar links */
font-size: 16px;
font-weight: bold;
text-shadow: 0 -1px 0 rgba(0,0,0,.5);
}
/* Navbar links: increase padding for taller navbar */
.navbar .nav > li > a {
padding: 15px 20px;
}
/* CUSTOMIZE THE CAROUSEL /* CUSTOMIZE THE CAROUSEL
@ -87,13 +63,7 @@ body {
padding: 0 20px; padding: 0 20px;
margin-top: 200px; margin-top: 200px;
} }
.carousel-caption h1,
.carousel-caption .lead {
margin: 0;
line-height: 1.25;
color: #fff;
text-shadow: 0 1px 1px rgba(0,0,0,.4);
}
.carousel-caption .btn { .carousel-caption .btn {
margin-top: 10px; margin-top: 10px;
} }
@ -157,10 +127,6 @@ body {
margin-bottom: 0; margin-bottom: 0;
width: auto; width: auto;
} }
.navbar-inner {
border-radius: 0;
margin: -20px 0;
}
.carousel .item { .carousel .item {
height: 500px; height: 500px;
@ -186,10 +152,6 @@ body {
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar-inner {
margin: -20px;
}
.carousel { .carousel {
margin-left: -20px; margin-left: -20px;
margin-right: -20px; margin-right: -20px;
@ -275,6 +237,12 @@ body {
<!-- Carousel <!-- Carousel
================================================== --> ================================================== -->
<div id="myCarousel" class="carousel slide"> <div id="myCarousel" class="carousel slide">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li>
<li data-target="#myCarousel" data-slide-to="2"></li>
</ol>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item active"> <div class="item active">
<img src="../../assets/img/examples/slide-01.jpg" alt=""> <img src="../../assets/img/examples/slide-01.jpg" alt="">