diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /examples/carousel | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples/carousel')
| -rw-r--r-- | examples/carousel/index.html | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/examples/carousel/index.html b/examples/carousel/index.html index e92c27f7c..a9d5d02bb 100644 --- a/examples/carousel/index.html +++ b/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="{{ page.base_url }}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> @@ -78,8 +82,8 @@ <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="#" role="button">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> @@ -89,7 +93,7 @@ <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="#" role="button">Learn more</a></p> + <p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p> </div> </div> </div> @@ -99,7 +103,7 @@ <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="#" role="button">Browse gallery</a></p> + <p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p> </div> </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> |