diff options
Diffstat (limited to 'docs/examples')
30 files changed, 588 insertions, 544 deletions
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index 53078b1c7..6395e48d2 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -6,7 +6,7 @@ <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>Blog Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="blog.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]--> </head> @@ -125,6 +129,8 @@ <div class="sidebar-module"> <h4>Archives</h4> <ol class="list-unstyled"> + <li><a href="#">March 2014</a></li> + <li><a href="#">February 2014</a></li> <li><a href="#">January 2014</a></li> <li><a href="#">December 2013</a></li> <li><a href="#">November 2013</a></li> @@ -135,8 +141,6 @@ <li><a href="#">June 2013</a></li> <li><a href="#">May 2013</a></li> <li><a href="#">April 2013</a></li> - <li><a href="#">March 2013</a></li> - <li><a href="#">February 2013</a></li> </ol> </div> <div class="sidebar-module"> @@ -164,7 +168,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> 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> diff --git a/docs/examples/cover/cover.css b/docs/examples/cover/cover.css index aee9449e6..9d566deda 100644 --- a/docs/examples/cover/cover.css +++ b/docs/examples/cover/cover.css @@ -33,8 +33,6 @@ body { color: #fff; text-align: center; text-shadow: 0 1px 3px rgba(0,0,0,.5); - -webkit-box-shadow: inset 0 0 100px rgba(0,0,0,.5); - box-shadow: inset 0 0 100px rgba(0,0,0,.5); } /* Extra markup and styles for table-esque vertical and horizontal centering */ @@ -43,6 +41,8 @@ body { width: 100%; height: 100%; /* For at least Firefox */ min-height: 100%; + -webkit-box-shadow: inset 0 0 100px rgba(0,0,0,.5); + box-shadow: inset 0 0 100px rgba(0,0,0,.5); } .site-wrapper-inner { display: table-cell; diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index b8ea5ae0f..193fc74b4 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -6,7 +6,7 @@ <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>Cover Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="cover.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]--> </head> @@ -68,7 +72,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> diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 1d5508878..5c6ec2b9c 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -6,7 +6,7 @@ <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>Dashboard Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="dashboard.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]--> </head> @@ -31,7 +35,7 @@ <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <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> @@ -236,7 +240,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> diff --git a/docs/examples/grid/grid.css b/docs/examples/grid/grid.css index a7a106d06..b25263bc7 100644 --- a/docs/examples/grid/grid.css +++ b/docs/examples/grid/grid.css @@ -1,8 +1,3 @@ -.container { - padding-right: 15px; - padding-left: 15px; -} - h4 { margin-top: 25px; } diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 54bdfbe0a..2dff5df9b 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -6,7 +6,7 @@ <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>Grid Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="grid.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]--> </head> diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html index 7e5541b99..304c8fc93 100644 --- a/docs/examples/jumbotron-narrow/index.html +++ b/docs/examples/jumbotron-narrow/index.html @@ -6,7 +6,7 @@ <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>Narrow Jumbotron Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="jumbotron-narrow.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]--> </head> @@ -30,7 +34,7 @@ <div class="container"> <div class="header"> - <ul class="nav nav-pills pull-right"> + <ul class="nav nav-pills pull-right" role="tablist"> <li class="active"><a href="#">Home</a></li> <li><a href="#">About</a></li> <li><a href="#">Contact</a></li> diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index cde6b398d..c0f54e5a6 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -6,7 +6,7 @@ <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>Jumbotron Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="jumbotron.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]--> </head> @@ -31,7 +35,7 @@ <div class="navbar navbar-inverse navbar-fixed-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> @@ -93,7 +97,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> </body> </html> diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html index ac20c7dd4..138d3c9bb 100644 --- a/docs/examples/justified-nav/index.html +++ b/docs/examples/justified-nav/index.html @@ -6,7 +6,7 @@ <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>Justified Nav Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="justified-nav.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]--> </head> diff --git a/docs/examples/justified-nav/justified-nav.css b/docs/examples/justified-nav/justified-nav.css index fd71b43a9..f8fcf5d13 100644 --- a/docs/examples/justified-nav/justified-nav.css +++ b/docs/examples/justified-nav/justified-nav.css @@ -37,6 +37,7 @@ body { background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e5e5e5)); background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); background-image: -o-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(top), color-stop(0%, #f5f5f5), to(#e5e5e5)); background-image: linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ background-repeat: repeat-x; /* Repeat the gradient */ diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html index 0d14827c4..99fa3ee93 100644 --- a/docs/examples/navbar-fixed-top/index.html +++ b/docs/examples/navbar-fixed-top/index.html @@ -6,7 +6,7 @@ <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>Fixed Top Navbar Example for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="navbar-fixed-top.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]--> </head> @@ -32,7 +36,7 @@ <div class="navbar navbar-default navbar-fixed-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> @@ -46,8 +50,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> @@ -85,7 +89,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> </body> </html> diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html index cd7b3aa76..33413fe51 100644 --- a/docs/examples/navbar-static-top/index.html +++ b/docs/examples/navbar-static-top/index.html @@ -6,7 +6,7 @@ <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>Static Top Navbar Example for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="navbar-static-top.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]--> </head> @@ -32,7 +36,7 @@ <div class="navbar navbar-default 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> @@ -46,8 +50,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> @@ -86,7 +90,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> </body> </html> diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index 8624c1eec..9f42e3fbb 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -6,7 +6,7 @@ <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>Navbar Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="navbar.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]--> </head> @@ -34,7 +38,7 @@ <div class="navbar navbar-default" role="navigation"> <div class="container-fluid"> <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="#">Link</a></li> <li><a href="#">Link</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> @@ -84,7 +88,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> </body> </html> diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html index 3d202d579..99ccb5b4c 100644 --- a/docs/examples/non-responsive/index.html +++ b/docs/examples/non-responsive/index.html @@ -8,7 +8,7 @@ <!-- Note there is no responsive meta tag here --> - <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> + <link rel="icon" href="../../favicon.ico"> <title>Non-responsive Template for Bootstrap</title> @@ -18,13 +18,17 @@ <!-- Custom styles for this template --> <link href="non-responsive.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]--> </head> @@ -34,7 +38,7 @@ <div class="navbar navbar-default navbar-fixed-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> @@ -73,7 +77,7 @@ <div class="page-header"> <h1>Non-responsive Bootstrap</h1> - <p class="lead">Disable the responsiveness of Bootstrap by fixing the width of the container and using the first grid system tier.</p> + <p class="lead">Disable the responsiveness of Bootstrap by fixing the width of the container and using the first grid system tier. <a href="http://getbootstrap.com/getting-started/#disable-responsive">Read the documentation</a> for more information.</p> </div> <h3>What changes</h3> @@ -99,7 +103,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> </body> </html> diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 439c79360..a250b402d 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -6,7 +6,7 @@ <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>Off Canvas Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="offcanvas.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]--> </head> @@ -30,7 +34,7 @@ <div class="navbar navbar-fixed-top navbar-inverse" 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> @@ -123,7 +127,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="offcanvas.js"></script> </body> diff --git a/docs/examples/offcanvas/offcanvas.js b/docs/examples/offcanvas/offcanvas.js index ade5751fd..d2f37f22c 100644 --- a/docs/examples/offcanvas/offcanvas.js +++ b/docs/examples/offcanvas/offcanvas.js @@ -1,5 +1,5 @@ $(document).ready(function () { - $('[data-toggle=offcanvas]').click(function () { + $('[data-toggle="offcanvas"]').click(function () { $('.row-offcanvas').toggleClass('active') }); });
\ No newline at end of file diff --git a/docs/examples/rtl/index.html b/docs/examples/rtl/index.html deleted file mode 100644 index 8dcdb7728..000000000 --- a/docs/examples/rtl/index.html +++ /dev/null @@ -1,382 +0,0 @@ -<!DOCTYPE html> -<html lang="ar" dir="rtl"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <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"> - - <title>RTL Template for Bootstrap</title> - - <!-- Bootstrap RTL CSS --> - <link href="../../dist/css/bootstrap-rtl.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="rtl.css" rel="stylesheet"> - - <!-- Just for debugging purposes. Don't actually copy this line! --> - <!--[if lt IE 9]><script src="../../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="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> - <![endif]--> - </head> - - <body role="document"> - - <!-- Fixed navbar --> - <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#">Bootstrap RTL</a> - </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - <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"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li class="dropdown-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - <div class="container theme-showcase" role="main"> - - <!-- Main jumbotron for a primary marketing message or call to action --> - <div class="jumbotron"> - <h1>RTL Bootstrap</h1> - <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p> - <p><a href="#" class="btn btn-primary btn-lg" role="button">Learn more »</a></p> - </div> - - - - <div class="page-header"> - <h1>Buttons</h1> - </div> - <p> - <button type="button" class="btn btn-lg btn-default">Default</button> - <button type="button" class="btn btn-lg btn-primary">Primary</button> - <button type="button" class="btn btn-lg btn-success">Success</button> - <button type="button" class="btn btn-lg btn-info">Info</button> - <button type="button" class="btn btn-lg btn-warning">Warning</button> - <button type="button" class="btn btn-lg btn-danger">Danger</button> - <button type="button" class="btn btn-lg btn-link">Link</button> - </p> - <p> - <button type="button" class="btn btn-default">Default</button> - <button type="button" class="btn btn-primary">Primary</button> - <button type="button" class="btn btn-success">Success</button> - <button type="button" class="btn btn-info">Info</button> - <button type="button" class="btn btn-warning">Warning</button> - <button type="button" class="btn btn-danger">Danger</button> - <button type="button" class="btn btn-link">Link</button> - </p> - <p> - <button type="button" class="btn btn-sm btn-default">Default</button> - <button type="button" class="btn btn-sm btn-primary">Primary</button> - <button type="button" class="btn btn-sm btn-success">Success</button> - <button type="button" class="btn btn-sm btn-info">Info</button> - <button type="button" class="btn btn-sm btn-warning">Warning</button> - <button type="button" class="btn btn-sm btn-danger">Danger</button> - <button type="button" class="btn btn-sm btn-link">Link</button> - </p> - <p> - <button type="button" class="btn btn-xs btn-default">Default</button> - <button type="button" class="btn btn-xs btn-primary">Primary</button> - <button type="button" class="btn btn-xs btn-success">Success</button> - <button type="button" class="btn btn-xs btn-info">Info</button> - <button type="button" class="btn btn-xs btn-warning">Warning</button> - <button type="button" class="btn btn-xs btn-danger">Danger</button> - <button type="button" class="btn btn-xs btn-link">Link</button> - </p> - - - - <div class="page-header"> - <h1>Thumbnails</h1> - </div> - <img data-src="holder.js/200x200" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera"> - - - - <div class="page-header"> - <h1>Dropdown menus</h1> - </div> - <div class="dropdown theme-dropdown clearfix"> - <a id="dropdownMenu1" href="#" role="button" class="sr-only dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> - <li class="active" role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation" class="divider"></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> - </ul> - </div> - - - - - <div class="page-header"> - <h1>Navbars</h1> - </div> - - <div class="navbar navbar-default"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#">Project name</a> - </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - <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"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li class="dropdown-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - <div class="navbar navbar-inverse"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#">Project name</a> - </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - <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"> - <li><a href="#">Action</a></li> - <li><a href="#">Another action</a></li> - <li><a href="#">Something else here</a></li> - <li class="divider"></li> - <li class="dropdown-header">Nav header</li> - <li><a href="#">Separated link</a></li> - <li><a href="#">One more separated link</a></li> - </ul> - </li> - </ul> - </div><!--/.nav-collapse --> - </div> - </div> - - - - <div class="page-header"> - <h1>Alerts</h1> - </div> - <div class="alert alert-success" role="alert"> - <strong>Well done!</strong> You successfully read this important alert message. - </div> - <div class="alert alert-info" role="alert"> - <strong>Heads up!</strong> This alert needs your attention, but it's not super important. - </div> - <div class="alert alert-warning" role="alert"> - <strong>Warning!</strong> Best check yo self, you're not looking too good. - </div> - <div class="alert alert-danger" role="alert"> - <strong>Oh snap!</strong> Change a few things up and try submitting again. - </div> - - - - <div class="page-header"> - <h1>Progress bars</h1> - </div> - <div class="progress"> - <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div> - </div> - <div class="progress"> - <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%"><span class="sr-only">40% Complete (success)</span></div> - </div> - <div class="progress"> - <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%"><span class="sr-only">20% Complete</span></div> - </div> - <div class="progress"> - <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% Complete (warning)</span></div> - </div> - <div class="progress"> - <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div> - </div> - <div class="progress"> - <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div> - <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div> - <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span></div> - </div> - - - - <div class="page-header"> - <h1>List groups</h1> - </div> - <div class="row"> - <div class="col-sm-4"> - <ul class="list-group"> - <li class="list-group-item">Cras justo odio</li> - <li class="list-group-item">Dapibus ac facilisis in</li> - <li class="list-group-item">Morbi leo risus</li> - <li class="list-group-item">Porta ac consectetur ac</li> - <li class="list-group-item">Vestibulum at eros</li> - </ul> - </div><!-- /.col-sm-4 --> - <div class="col-sm-4"> - <div class="list-group"> - <a href="#" class="list-group-item active"> - Cras justo odio - </a> - <a href="#" class="list-group-item">Dapibus ac facilisis in</a> - <a href="#" class="list-group-item">Morbi leo risus</a> - <a href="#" class="list-group-item">Porta ac consectetur ac</a> - <a href="#" class="list-group-item">Vestibulum at eros</a> - </div> - </div><!-- /.col-sm-4 --> - <div class="col-sm-4"> - <div class="list-group"> - <a href="#" class="list-group-item active"> - <h4 class="list-group-item-heading">List group item heading</h4> - <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p> - </a> - <a href="#" class="list-group-item"> - <h4 class="list-group-item-heading">List group item heading</h4> - <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p> - </a> - <a href="#" class="list-group-item"> - <h4 class="list-group-item-heading">List group item heading</h4> - <p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.</p> - </a> - </div> - </div><!-- /.col-sm-4 --> - </div> - - - - <div class="page-header"> - <h1>Panels</h1> - </div> - <div class="row"> - <div class="col-sm-4"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - <div class="panel panel-primary"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - </div><!-- /.col-sm-4 --> - <div class="col-sm-4"> - <div class="panel panel-success"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - <div class="panel panel-info"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - </div><!-- /.col-sm-4 --> - <div class="col-sm-4"> - <div class="panel panel-warning"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - <div class="panel panel-danger"> - <div class="panel-heading"> - <h3 class="panel-title">Panel title</h3> - </div> - <div class="panel-body"> - Panel content - </div> - </div> - </div><!-- /.col-sm-4 --> - </div> - - - - <div class="page-header"> - <h1>Wells</h1> - </div> - <div class="well"> - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.</p> - </div> - - - </div> <!-- /container --> - - - <!-- 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="../../dist/js/bootstrap.min.js"></script> - <script src="../../assets/js/docs.min.js"></script> - </body> -</html> diff --git a/docs/examples/rtl/rtl.css b/docs/examples/rtl/rtl.css deleted file mode 100644 index 181f99842..000000000 --- a/docs/examples/rtl/rtl.css +++ /dev/null @@ -1,14 +0,0 @@ -body { - padding-top: 70px; - padding-bottom: 30px; -} - -.theme-dropdown .dropdown-menu { - position: static; - display: block; - margin-bottom: 20px; -} - -.theme-showcase > p > .btn { - margin: 5px 0; -} diff --git a/docs/examples/screenshots/equal-height-columns.jpg b/docs/examples/screenshots/equal-height-columns.jpg Binary files differnew file mode 100644 index 000000000..8da3444d3 --- /dev/null +++ b/docs/examples/screenshots/equal-height-columns.jpg diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html index c04764f95..f25bedad7 100644 --- a/docs/examples/signin/index.html +++ b/docs/examples/signin/index.html @@ -6,7 +6,7 @@ <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>Signin Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="signin.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]--> </head> @@ -34,9 +38,11 @@ <h2 class="form-signin-heading">Please sign in</h2> <input type="email" class="form-control" placeholder="Email address" required autofocus> <input type="password" class="form-control" placeholder="Password" required> - <label class="checkbox"> - <input type="checkbox" value="remember-me"> Remember me - </label> + <div class="checkbox"> + <label> + <input type="checkbox" value="remember-me"> Remember me + </label> + </div> <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button> </form> diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index 6dc26fe87..717574b88 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -6,7 +6,7 @@ <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>Starter Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="starter-template.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]--> </head> @@ -31,7 +35,7 @@ <div class="navbar navbar-inverse navbar-fixed-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> @@ -62,7 +66,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> </body> </html> diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 9c7566ed6..ae4afb074 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -6,7 +6,7 @@ <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>Sticky Footer Navbar Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="sticky-footer-navbar.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]--> </head> @@ -32,7 +36,7 @@ <div class="navbar navbar-default navbar-fixed-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> @@ -46,8 +50,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> @@ -81,7 +85,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> </body> </html> diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html index 5788cd5c9..a248e032f 100644 --- a/docs/examples/sticky-footer/index.html +++ b/docs/examples/sticky-footer/index.html @@ -6,7 +6,7 @@ <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>Sticky Footer Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="sticky-footer.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]--> </head> diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index 2d49cc764..2412b2206 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -6,7 +6,7 @@ <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>Theme Template for Bootstrap</title> @@ -18,13 +18,17 @@ <!-- Custom styles for this template --> <link href="theme.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]--> </head> @@ -34,7 +38,7 @@ <div class="navbar navbar-inverse navbar-fixed-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> @@ -118,6 +122,148 @@ <div class="page-header"> + <h1>Tables</h1> + </div> + <div class="row"> + <div class="col-md-6"> + <table class="table"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <td>1</td> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <td>2</td> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <td>3</td> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> + </tr> + </tbody> + </table> + </div> + <div class="col-md-6"> + <table class="table table-striped"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <td>1</td> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <td>2</td> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <td>3</td> + <td>Larry</td> + <td>the Bird</td> + <td>@twitter</td> + </tr> + </tbody> + </table> + </div> + </div> + + <div class="row"> + <div class="col-md-6"> + <table class="table table-bordered"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <td rowspan="2">1</td> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <td>Mark</td> + <td>Otto</td> + <td>@TwBootstrap</td> + </tr> + <tr> + <td>2</td> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <td>3</td> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> + </tr> + </tbody> + </table> + </div> + <div class="col-md-6"> + <table class="table table-condensed"> + <thead> + <tr> + <th>#</th> + <th>First Name</th> + <th>Last Name</th> + <th>Username</th> + </tr> + </thead> + <tbody> + <tr> + <td>1</td> + <td>Mark</td> + <td>Otto</td> + <td>@mdo</td> + </tr> + <tr> + <td>2</td> + <td>Jacob</td> + <td>Thornton</td> + <td>@fat</td> + </tr> + <tr> + <td>3</td> + <td colspan="2">Larry the Bird</td> + <td>@twitter</td> + </tr> + </tbody> + </table> + </div> + </div> + + + + <div class="page-header"> <h1>Thumbnails</h1> </div> <img data-src="holder.js/200x200" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera"> @@ -125,10 +271,85 @@ <div class="page-header"> + <h1>Labels</h1> + </div> + <h1> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h1> + <h2> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h2> + <h3> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h3> + <h4> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h4> + <h5> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h5> + <h6> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </h6> + <p> + <span class="label label-default">Default</span> + <span class="label label-primary">Primary</span> + <span class="label label-success">Success</span> + <span class="label label-info">Info</span> + <span class="label label-warning">Warning</span> + <span class="label label-danger">Danger</span> + </p> + + + + <div class="page-header"> + <h1>Badges</h1> + </div> + <p> + <a href="#">Inbox <span class="badge">42</span></a> + </p> + <ul class="nav nav-pills" role="tablist"> + <li class="active"><a href="#">Home <span class="badge">42</span></a></li> + <li><a href="#">Profile</a></li> + <li><a href="#">Messages <span class="badge">3</span></a></li> + </ul> + + + <div class="page-header"> <h1>Dropdown menus</h1> </div> <div class="dropdown theme-dropdown clearfix"> - <a id="dropdownMenu1" href="#" role="button" class="sr-only dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a> + <a id="dropdownMenu1" href="#" role="button" class="sr-only dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a> <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> <li class="active" role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> @@ -140,6 +361,21 @@ + <div class="page-header"> + <h1>Navs</h1> + </div> + <ul class="nav nav-tabs" role="tablist"> + <li class="active"><a href="#">Home</a></li> + <li><a href="#">Profile</a></li> + <li><a href="#">Messages</a></li> + </ul> + <ul class="nav nav-pills" role="tablist"> + <li class="active"><a href="#">Home</a></li> + <li><a href="#">Profile</a></li> + <li><a href="#">Messages</a></li> + </ul> + + <div class="page-header"> <h1>Navbars</h1> @@ -148,7 +384,7 @@ <div class="navbar navbar-default"> <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> @@ -162,8 +398,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> @@ -181,7 +417,7 @@ <div class="navbar navbar-inverse"> <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> @@ -195,8 +431,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> @@ -250,6 +486,9 @@ <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div> </div> <div class="progress"> + <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">100% Complete</span></div> + </div> + <div class="progress"> <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div> <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div> <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span></div> @@ -371,13 +610,45 @@ </div> + + <div class="page-header"> + <h1>Carousel</h1> + </div> + <div id="carousel-example-generic" class="carousel slide" data-ride="carousel"> + <ol class="carousel-indicators"> + <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li> + <li data-target="#carousel-example-generic" data-slide-to="1"></li> + <li data-target="#carousel-example-generic" data-slide-to="2"></li> + </ol> + <div class="carousel-inner" role="listbox"> + <div class="item active"> + <img data-src="holder.js/1140x500/auto/#777:#555/text:First slide" alt="First slide"> + </div> + <div class="item"> + <img data-src="holder.js/1140x500/auto/#666:#444/text:Second slide" alt="Second slide"> + </div> + <div class="item"> + <img data-src="holder.js/1140x500/auto/#555:#333/text:Third slide" alt="Third slide"> + </div> + </div> + <a class="left carousel-control" href="#carousel-example-generic" 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="#carousel-example-generic" role="button" data-slide="next"> + <span class="glyphicon glyphicon-chevron-right"></span> + <span class="sr-only">Next</span> + </a> + </div> + + </div> <!-- /container --> <!-- 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> diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css index 181f99842..b7c8d4cd2 100644 --- a/docs/examples/theme/theme.css +++ b/docs/examples/theme/theme.css @@ -12,3 +12,7 @@ body { .theme-showcase > p > .btn { margin: 5px 0; } + +.theme-showcase .navbar .container { + width: auto; +} diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html new file mode 100644 index 000000000..ddeb70774 --- /dev/null +++ b/docs/examples/tooltip-viewport/index.html @@ -0,0 +1,58 @@ +<!DOCTYPE html> +<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"> + <meta name="description" content=""> + <meta name="author" content=""> + <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> + + <title>Tooltip Viewport Example for Bootstrap</title> + + <!-- Bootstrap core CSS --> + <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + + <!-- Custom styles for this template --> + <link href="tooltip-viewport.css" rel="stylesheet"> + + <!-- 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/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <![endif]--> + </head> + + <body> + + <button class="btn btn-default pull-right tooltip-bottom" title="This should be shifted to the left">Shift Left</button> + <button class="btn btn-default tooltip-bottom" title="This should be shifted to the right">Shift Right</button> + <button class="btn btn-default tooltip-right" title="This should be shifted down">Shift Down</button> + + <button class="btn btn-default tooltip-right btn-bottom" title="This should be shifted up">Shift Up</button> + + <div class="container-viewport"> + <button class="btn btn-default tooltip-viewport-bottom" title="This should be shifted to the left">Shift Left</button> + <button class="btn btn-default tooltip-viewport-right" title="This should be shifted down">Shift Down</button> + + <button class="btn btn-default pull-right tooltip-viewport-bottom" title="This should be shifted to the right">Shift Right</button> + + <button class="btn btn-default tooltip-viewport-right btn-bottom" title="This should be shifted up">Shift Up</button> + </div> + + + <!-- 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.1/jquery.min.js"></script> + <script src="../../dist/js/bootstrap.min.js"></script> + <script src="tooltip-viewport.js"></script> + </body> +</html> diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.css b/docs/examples/tooltip-viewport/tooltip-viewport.css new file mode 100644 index 000000000..26aa2e348 --- /dev/null +++ b/docs/examples/tooltip-viewport/tooltip-viewport.css @@ -0,0 +1,26 @@ +body { + height: 1200px; +} +.tooltip { + min-width: 250px; + max-width: 500px; +} +.tooltip .tooltip-inner { + min-width: 250px; + max-width: 500px; + min-height: 100px; + text-align: left; +} +.container-viewport { + position: absolute; + top: 100px; + right: 250px; + left: 250px; + height: 300px; + background-color: #eee; +} +.btn-bottom { + position: absolute; + bottom: 0; + left: 0; +} diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.js b/docs/examples/tooltip-viewport/tooltip-viewport.js new file mode 100644 index 000000000..e87f4eec7 --- /dev/null +++ b/docs/examples/tooltip-viewport/tooltip-viewport.js @@ -0,0 +1,18 @@ +$(document).ready(function () { + $('.tooltip-right').tooltip({ + placement: 'right', + viewport: {selector: 'body', padding: 2} + }) + $('.tooltip-bottom').tooltip({ + placement: 'bottom', + viewport: {selector: 'body', padding: 2} + }) + $('.tooltip-viewport-right').tooltip({ + placement: 'right', + viewport: {selector: '.container-viewport', padding: 2} + }) + $('.tooltip-viewport-bottom').tooltip({ + placement: 'bottom', + viewport: {selector: '.container-viewport', padding: 2} + }) +}) |
