summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/examples/carousel
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-10-30 16:13:42 -0400
committerThomas Park <thomas@thomaspark.me>2013-10-30 16:13:42 -0400
commit48c64127b37be4a692a70cb7b38ed9744163582b (patch)
treedcf4b4b76612269a6b135c695861eca7e89a0cfa /bower_components/bootstrap/examples/carousel
parent620e501c3d804b1dc2c7d796d7ae378db5e1a040 (diff)
3.0.0 -> 3.0.1
Diffstat (limited to 'bower_components/bootstrap/examples/carousel')
-rwxr-xr-xbower_components/bootstrap/examples/carousel/carousel.css30
-rwxr-xr-xbower_components/bootstrap/examples/carousel/index.html48
2 files changed, 51 insertions, 27 deletions
diff --git a/bower_components/bootstrap/examples/carousel/carousel.css b/bower_components/bootstrap/examples/carousel/carousel.css
index 164f306e..a728bd89 100755
--- a/bower_components/bootstrap/examples/carousel/carousel.css
+++ b/bower_components/bootstrap/examples/carousel/carousel.css
@@ -14,8 +14,21 @@ body {
/* Special class on .container surrounding .navbar, used for positioning it into place. */
.navbar-wrapper {
- position: relative;
- z-index: 15;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ z-index: 20;
+}
+
+/* Flip around the padding for proper display in narrow viewports */
+.navbar-wrapper .container {
+ padding-left: 0;
+ padding-right: 0;
+}
+.navbar-wrapper .navbar {
+ padding-left: 15px;
+ padding-right: 15px;
}
@@ -24,10 +37,8 @@ body {
/* Carousel base class */
.carousel {
+ height: 500px;
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 {
@@ -103,6 +114,15 @@ body {
.navbar-wrapper {
margin-top: 20px;
}
+ .navbar-wrapper .container {
+ padding-left: 15px;
+ padding-right: 15px;
+ }
+ .navbar-wrapper .navbar {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
/* The navbar becomes detached from the top, so we round the corners */
.navbar-wrapper .navbar {
border-radius: 4px;
diff --git a/bower_components/bootstrap/examples/carousel/index.html b/bower_components/bootstrap/examples/carousel/index.html
index d962c1e6..14674eeb 100755
--- a/bower_components/bootstrap/examples/carousel/index.html
+++ b/bower_components/bootstrap/examples/carousel/index.html
@@ -2,20 +2,24 @@
<html lang="en">
<head>
<meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+ <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
<title>Carousel Template for Bootstrap</title>
<!-- Bootstrap core CSS -->
<link href="../../dist/css/bootstrap.css" rel="stylesheet">
+ <!-- Just for debugging purposes. Don't actually copy this line! -->
+ <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
- <script src="../../assets/js/html5shiv.js"></script>
- <script src="../../assets/js/respond.min.js"></script>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<!-- Custom styles for this template -->
@@ -65,7 +69,7 @@
<!-- Carousel
================================================== -->
- <div id="myCarousel" class="carousel slide">
+ <div id="myCarousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
@@ -74,32 +78,32 @@
</ol>
<div class="carousel-inner">
<div class="item active">
- <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
+ <img data-src="holder.js/900x500/auto/#777:#7a7a7a/text:First slide" alt="First slide">
<div class="container">
<div class="carousel-caption">
<h1>Example headline.</h1>
- <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>
- <p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
+ <p>Note: If you're viewing this page via a <code>file://</code> URL, the "next" and "previous" Glyphicon buttons on the left and right might not load/display properly due to web browser security rules.</p>
+ <p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
</div>
</div>
</div>
<div class="item">
- <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Second slide" alt="Second slide">
+ <img data-src="holder.js/900x500/auto/#666:#6a6a6a/text:Second slide" alt="Second slide">
<div class="container">
<div class="carousel-caption">
<h1>Another example headline.</h1>
<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>
- <p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
+ <p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p>
</div>
</div>
</div>
<div class="item">
- <img src="data:image/png;base64," data-src="holder.js/100%x500/auto/#777:#7a7a7a/text:Third slide" alt="Third slide">
+ <img data-src="holder.js/900x500/auto/#555:#5a5a5a/text:Third slide" alt="Third slide">
<div class="container">
<div class="carousel-caption">
<h1>One more for good measure.</h1>
<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>
- <p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
+ <p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
</div>
</div>
</div>
@@ -119,22 +123,22 @@
<!-- Three columns of text below the carousel -->
<div class="row">
<div class="col-lg-4">
- <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
+ <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image">
<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.</p>
- <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+ <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div><!-- /.col-lg-4 -->
<div class="col-lg-4">
- <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
+ <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image">
<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.</p>
- <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+ <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div><!-- /.col-lg-4 -->
<div class="col-lg-4">
- <img class="img-circle" src="data:image/png;base64," data-src="holder.js/140x140" alt="Generic placeholder image">
+ <img class="img-circle" data-src="holder.js/140x140" alt="Generic placeholder image">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
- <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
+ <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
</div><!-- /.col-lg-4 -->
</div><!-- /.row -->
@@ -149,7 +153,7 @@
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>
<div class="col-md-5">
- <img class="featurette-image img-responsive" src="data:image/png;base64," data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+ <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
</div>
</div>
@@ -157,7 +161,7 @@
<div class="row featurette">
<div class="col-md-5">
- <img class="featurette-image img-responsive" src="data:image/png;base64," data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+ <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
</div>
<div class="col-md-7">
<h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2>
@@ -173,7 +177,7 @@
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>
<div class="col-md-5">
- <img class="featurette-image img-responsive" src="data:image/png;base64," data-src="holder.js/500x500/auto" alt="Generic placeholder image">
+ <img class="featurette-image img-responsive" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
</div>
</div>
@@ -194,8 +198,8 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="../../assets/js/jquery.js"></script>
+ <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
- <script src="../../assets/js/holder.js"></script>
+ <script src="../../docs-assets/js/holder.js"></script>
</body>
</html>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 12:12:16 +0000