Skip to content

B
bootstrap
Commit 0ac71105 authored by Mark Otto's avatar Mark Otto
Browse files
Options

refactor some of the carousel caption stuff to center it and tighten styles... 

refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first
parent 0f51a750
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 59 deletions
docs/assets/css/bootstrap.css
View file @ 0ac71105
...@@ -5137,13 +5137,14 @@ a.list-group-item.active > .badge, ...@@ -5137,13 +5137,14 @@ a.list-group-item.active > .badge,
.carousel-caption { .carousel-caption {
position: absolute; position: absolute;
right: 20%; right: 15%;
bottom: 20px; bottom: 20px;
left: 20%; left: 15%;
display: none; z-index: 10;
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
color: #fff; color: #fff;
text-align: center;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
} }
...@@ -5160,14 +5161,7 @@ a.list-group-item.active > .badge, ...@@ -5160,14 +5161,7 @@ a.list-group-item.active > .badge,
font-size: 30px; font-size: 30px;
} }
.carousel-caption { .carousel-caption {
right: 0; padding-bottom: 30px;
left: 0;
z-index: 10;
display: block;
max-width: 60%;
padding: 30px;
margin-right: 0;
margin-left: 0;
} }
} }
......
docs/docs.html
View file @ 0ac71105
...@@ -6304,21 +6304,21 @@ $('#myCollapsible').on('hidden', function () { ...@@ -6304,21 +6304,21 @@ $('#myCollapsible').on('hidden', function () {
<img data-src="holder.js/900x500/auto/#777:#777" alt=""> <img data-src="holder.js/900x500/auto/#777:#777" alt="">
<div class="carousel-caption"> <div class="carousel-caption">
<h3>First slide label</h3> <h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue. Maecenas faucibus mollis interdum. Cum sociis natoque penatibus et magnis dis parturient montes.</p> <p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/900x500/auto/#777:#777" alt=""> <img data-src="holder.js/900x500/auto/#777:#777" alt="">
<div class="carousel-caption"> <div class="carousel-caption">
<h3>Second slide label</h3> <h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean lacinia bibendum nulla sed consectetur. Nullam quis risus eget urna mollis ornare.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/900x500/auto/#777:#777" alt=""> <img data-src="holder.js/900x500/auto/#777:#777" alt="">
<div class="carousel-caption"> <div class="carousel-caption">
<h3>Third slide label</h3> <h3>Third slide label</h3>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p> <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
</div> </div>
</div> </div>
</div> </div>
......
docs/examples/carousel.html
View file @ 0ac71105
...@@ -27,11 +27,10 @@ body { ...@@ -27,11 +27,10 @@ body {
left: 0; left: 0;
right: 0; right: 0;
z-index: 10; z-index: 10;
margin-top: 20px;
margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
} }
/* CUSTOMIZE THE CAROUSEL /* CUSTOMIZE THE CAROUSEL
-------------------------------------------------- */ -------------------------------------------------- */
...@@ -39,12 +38,12 @@ body { ...@@ -39,12 +38,12 @@ body {
.carousel { .carousel {
margin-bottom: 60px; margin-bottom: 60px;
} }
/* Since positioning the image, we need to help out the caption */
.carousel .container { .carousel-caption {
position: relative; z-index: 10;
z-index: 9;
} }
/* Declare heights because of positioning of img element */
.carousel .item { .carousel .item {
height: 500px; height: 500px;
} }
...@@ -56,26 +55,21 @@ body { ...@@ -56,26 +55,21 @@ body {
height: 500px; height: 500px;
} }
.carousel-caption {
background-color: transparent;
position: static;
max-width: 550px;
padding: 0 20px;
margin-top: 200px;
}
.carousel-caption .btn {
margin-top: 10px;
}
/* MARKETING CONTENT /* MARKETING CONTENT
-------------------------------------------------- */ -------------------------------------------------- */
/* Pad the edges of the mobile views a bit */
.marketing {
padding-left: 15px;
padding-right: 15px;
}
/* Center align the text within the three columns below the carousel */ /* Center align the text within the three columns below the carousel */
.marketing .col-span-4 { .marketing .col-span-4 {
text-align: center; text-align: center;
margin-bottom: 20px;
} }
.marketing h2 { .marketing h2 {
font-weight: normal; font-weight: normal;
...@@ -121,7 +115,35 @@ body { ...@@ -121,7 +115,35 @@ body {
/* RESPONSIVE CSS /* RESPONSIVE CSS
-------------------------------------------------- */ -------------------------------------------------- */
@media (max-width: 979px) { @media (min-width: 768px) {
/* Remve the edge padding needed for mobile */
.marketing {
padding-left: 0;
padding-right: 0;
}
/* 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 {
border-radius: 4px;
}
/* Bump up size of carousel content */
.carousel-caption p {
margin-bottom: 20px;
font-size: 21px;
line-height: 1.4;
}
}
/*@media (max-width: 979px) {
.container.navbar-wrapper { .container.navbar-wrapper {
margin-bottom: 0; margin-bottom: 0;
...@@ -189,7 +211,7 @@ body { ...@@ -189,7 +211,7 @@ body {
font-size: 18px; font-size: 18px;
line-height: 1.5; line-height: 1.5;
} }
.navbar-wrapper { .navbar-wrapper {
margin-top: 0; margin-top: 0;
} }
...@@ -197,12 +219,12 @@ body { ...@@ -197,12 +219,12 @@ body {
.navbar { .navbar {
border-radius: 0; border-radius: 0;
} }
#myCarousel { #myCarousel {
margin-top: 54px; margin-top: 54px;
} }
} }*/
</style> </style>
...@@ -212,7 +234,7 @@ body { ...@@ -212,7 +234,7 @@ body {
<div class="navbar-wrapper"> <div class="navbar-wrapper">
<div class="container"> <div class="container">
<div class="navbar navbar-inverse"> <div class="navbar navbar-inverse navbar-static-top">
<div class="container"> <div class="container">
<a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
...@@ -257,32 +279,32 @@ body { ...@@ -257,32 +279,32 @@ body {
</ol> </ol>
<div class="carousel-inner"> <div class="carousel-inner">
<div class="item active"> <div class="item active">
<img data-src="holder.js/1500x550/auto/#777:#fff/text:First slide" alt=""> <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:First slide" alt="">
<div class="container"> <div class="container">
<div class="carousel-caption"> <div class="carousel-caption">
<h1>Example headline.</h1> <h1>Example headline.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Sign up today</a> <p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
</div> </div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/1500x550/auto/#777:#fff/text:Second slide" alt=""> <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Second slide" alt="">
<div class="container"> <div class="container">
<div class="carousel-caption"> <div class="carousel-caption">
<h1>Another example headline.</h1> <h1>Another example headline.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Learn more</a> <p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
</div> </div>
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<img data-src="holder.js/1500x550/auto/#777:#fff/text:Third slide" alt=""> <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Third slide" alt="">
<div class="container"> <div class="container">
<div class="carousel-caption"> <div class="carousel-caption">
<h1>One more for good measure.</h1> <h1>One more for good measure.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Browse gallery</a> <p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -304,13 +326,13 @@ body { ...@@ -304,13 +326,13 @@ body {
<div class="col-span-4"> <div class="col-span-4">
<img class="img-circle" data-src="holder.js/140x140"> <img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2> <h2>Heading</h2>
<p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p> <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
<p><a class="btn" href="#">View details &raquo;</a></p> <p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.col-span-4 --> </div><!-- /.col-span-4 -->
<div class="col-span-4"> <div class="col-span-4">
<img class="img-circle" data-src="holder.js/140x140"> <img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2> <h2>Heading</h2>
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
<p><a class="btn" href="#">View details &raquo;</a></p> <p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.col-span-4 --> </div><!-- /.col-span-4 -->
<div class="col-span-4"> <div class="col-span-4">
......
less/carousel.less
View file @ 0ac71105
...@@ -155,13 +155,14 @@ ...@@ -155,13 +155,14 @@
// Hidden by default for smaller viewports // Hidden by default for smaller viewports
.carousel-caption { .carousel-caption {
position: absolute; position: absolute;
left: 20%; left: 15%;
right: 20%; right: 15%;
bottom: 20px; bottom: 20px;
display: none; z-index: 10;
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
color: #fff; color: #fff;
text-align: center;
text-shadow: 0 1px 2px rgba(0,0,0,.6); text-shadow: 0 1px 2px rgba(0,0,0,.6);
& .btn { & .btn {
text-shadow: none; // No shadow for button elements in carousel-caption text-shadow: none; // No shadow for button elements in carousel-caption
...@@ -183,13 +184,8 @@ ...@@ -183,13 +184,8 @@
// Show and left align the captions // Show and left align the captions
.carousel-caption { .carousel-caption {
left: 0; left: 20%;
right: 0; right: 20%;
z-index: 10; padding-bottom: 30px;
display: block;
max-width: 60%;
padding: 30px;
margin-left: 0;
margin-right: 0;
} }
} }
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