diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /docs/examples/carousel | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'docs/examples/carousel')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 8 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index 58fdde1cb..5fbdea52e 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -35,14 +35,6 @@ body { height: 32rem; } -.carousel-indicators li { - width: .75rem; - height: .75rem; - margin-right: .25rem; - margin-left: .25rem; - border-radius: 50%; -} - /* MARKETING CONTENT -------------------------------------------------- */ diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 71f3c17f4..6815c3bd7 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,13 +17,13 @@ </head> <body> - <nav class="navbar navbar-inverse navbar-fixed-top navbar-toggleable-md 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> <a class="navbar-brand" href="#">Carousel</a> <div class="collapse navbar-collapse" id="navbarCollapse"> - <ul class="nav navbar-nav mt-2 mt-lg-0"> + <ul class="navbar-nav mr-auto"> <li class="nav-item active"> <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a> </li> @@ -167,7 +165,7 @@ <!-- FOOTER --> <footer> <p class="float-right"><a href="#">Back to top</a></p> - <p>© 2014 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> + <p>© 2017 Company, Inc. · <a href="#">Privacy</a> · <a href="#">Terms</a></p> </footer> </div><!-- /.container --> @@ -176,7 +174,7 @@ <!-- 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="../../dist/js/bootstrap.min.js"></script> |