aboutsummaryrefslogtreecommitdiff
path: root/docs/examples/carousel
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-01-05 14:53:08 -0800
committerMark Otto <[email protected]>2017-01-05 14:53:08 -0800
commit0c12ccbeb6fdf0dd3818f97260aa43c79108d377 (patch)
tree0c0c0636c91c6ebed1b04dbe21bd00370761c501 /docs/examples/carousel
parent5d7db507396275fcda96935aff47b09e1d79ddc1 (diff)
parent43d9391fba015f13f06f3af4dc6f5a8205cb548b (diff)
downloadbootstrap-0c12ccbeb6fdf0dd3818f97260aa43c79108d377.tar.xz
bootstrap-0c12ccbeb6fdf0dd3818f97260aa43c79108d377.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'docs/examples/carousel')
-rw-r--r--docs/examples/carousel/index.html10
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index f69a627ce..1ca427d52 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -2,9 +2,7 @@
<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, shrink-to-fit=no">
- <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../favicon.ico">
@@ -19,7 +17,7 @@
</head>
<body>
- <nav class="navbar navbar-toggleable-md navbar-inverse navbar-fixed-top bg-inverse">
+ <nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -167,7 +165,7 @@
<!-- FOOTER -->
<footer>
<p class="float-right"><a href="#">Back to top</a></p>
- <p>&copy; 2014 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
+ <p>&copy; 2017 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>
</div><!-- /.container -->
@@ -176,9 +174,9 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" integrity="sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY" crossorigin="anonymous"></script>
+ <script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="../../dist/js/bootstrap.min.js"></script>
<!-- Just to make our placeholder images work. Don't actually copy the next line! -->
<script src="../../assets/js/vendor/holder.min.js"></script>