diff options
Diffstat (limited to 'docs/examples/carousel')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 17 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 32 |
2 files changed, 25 insertions, 24 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index 08448b99c..bd7567af3 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -22,7 +22,7 @@ body { } /* Flip around the padding for proper display in narrow viewports */ -.navbar-wrapper .container { +.navbar-wrapper > .container { padding-right: 0; padding-left: 0; } @@ -30,6 +30,9 @@ body { padding-right: 15px; padding-left: 15px; } +.navbar-wrapper .navbar .container { + width: auto; +} /* CUSTOMIZE THE CAROUSEL @@ -63,12 +66,6 @@ body { /* MARKETING CONTENT -------------------------------------------------- */ -/* Pad the edges of the mobile views a bit */ -.marketing { - padding-right: 15px; - padding-left: 15px; -} - /* Center align the text within the three columns below the carousel */ .marketing .col-lg-4 { margin-bottom: 20px; @@ -104,12 +101,6 @@ body { @media (min-width: 768px) { - /* Remove the edge padding needed for mobile */ - .marketing { - padding-right: 0; - padding-left: 0; - } - /* Navbar positioning foo */ .navbar-wrapper { margin-top: 20px; diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 82883c844..42998f1e4 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -6,20 +6,24 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> + <link rel="icon" href="../../favicon.ico"> <title>Carousel Template for Bootstrap</title> <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> - <!-- Just for debugging purposes. Don't actually copy this line! --> + <!-- Just for debugging purposes. Don't actually copy these 2 lines! --> <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <script src="../../assets/js/ie-emulation-modes-warning.js"></script> + + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> - <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> <!-- Custom styles for this template --> @@ -34,7 +38,7 @@ <div class="navbar navbar-inverse navbar-static-top" role="navigation"> <div class="container"> <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -48,8 +52,8 @@ <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> - <ul class="dropdown-menu"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> <li><a href="#">Action</a></li> <li><a href="#">Another action</a></li> <li><a href="#">Something else here</a></li> @@ -77,7 +81,7 @@ <li data-target="#myCarousel" data-slide-to="1"></li> <li data-target="#myCarousel" data-slide-to="2"></li> </ol> - <div class="carousel-inner"> + <div class="carousel-inner" role="listbox"> <div class="item active"> <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide"> <div class="container"> @@ -109,8 +113,14 @@ </div> </div> </div> - <a class="left carousel-control" href="#myCarousel" data-slide="prev"><span class="glyphicon glyphicon-chevron-left"></span></a> - <a class="right carousel-control" href="#myCarousel" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a> + <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev"> + <span class="glyphicon glyphicon-chevron-left"></span> + <span class="sr-only">Previous</span> + </a> + <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next"> + <span class="glyphicon glyphicon-chevron-right"></span> + <span class="sr-only">Next</span> + </a> </div><!-- /.carousel --> @@ -199,7 +209,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/1.11.0/jquery.min.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script> <script src="../../assets/js/docs.min.js"></script> </body> |