rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

hella examples fixing, mostly navbars and lots of work on grids example

Browse Source
This commit is contained in:
Mark Otto 2013-08-15 17:39:37 -07:00
parent 05ebd5ebf9
commit 024e320e5c
18 changed files with 278 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_includes/nav-getting-started.html
View File

@ -11,6 +11,9 @@
<li> <li>
<a href="#template">Basic template</a> <a href="#template">Basic template</a>
</li> </li>
<li>
<a href="#examples">Examples</a>
</li>
<li> <li>
<a href="#disable-responsive">Disabling responsiveness</a> <a href="#disable-responsive">Disabling responsiveness</a>
</li> </li>

28
examples/carousel/index.html
View File

@ -9,8 +9,8 @@
<title>Carousel Template for Bootstrap</title> <title>Carousel Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<link href="../bootstrap/css/bootstrap-glyphicons.css" rel="stylesheet"> <link href="../../dist/css/bootstrap-glyphicons.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="carousel.css" rel="stylesheet"> <link href="carousel.css" rel="stylesheet">
@ -23,13 +23,15 @@
<div class="navbar navbar-inverse navbar-static-top"> <div class="navbar navbar-inverse navbar-static-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -41,7 +43,7 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="nav-header">Nav header</li> <li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
@ -175,8 +177,8 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../assets/js/holder.js"></script> <script src="../../assets/js/holder.js"></script>
</body> </body>
</html> </html>

13
examples/grid/grid.css
View File

@ -13,9 +13,16 @@ h4 {
margin-top: 10px; margin-top: 10px;
margin-bottom: 0; margin-bottom: 0;
} }
[class*="col-lg-"] { [class*="col-"] {
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
background-color: rgba(185,74,72,.15); background-color: #eee;
border: 1px solid rgba(185,74,72,.2); border: 1px solid #ddd;
background-color: rgba(86,61,124,.15);
border: 1px solid rgba(86,61,124,.2);
} }
hr {
margin-top: 40px;
margin-bottom: 40px;
}

94
examples/grid/index.html
View File

@ -9,7 +9,7 @@
<title>Grid Template for Bootstrap</title> <title>Grid Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="grid.css" rel="stylesheet"> <link href="grid.css" rel="stylesheet">
@ -18,72 +18,88 @@
<body> <body>
<div class="container"> <div class="container">
<h2>Bootstrap grids</h2> <div class="page-header">
<p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p> <h1>Bootstrap grid examples</h1>
<p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
<h4>Three equal columns</h4>
<div class="row">
<div class="col-lg-4">.col-lg-4</div>
<div class="col-lg-4">.col-lg-4</div>
<div class="col-lg-4">.col-lg-4</div>
</div> </div>
<h4>Three unequal columns</h4> <h3>Three equal columns</h3>
<p>Get three equal-width columns <strong>starting at desktops and scaling to large desktops</strong>. On mobile devices, tablets and below, the columns will automatically stack.</p>
<div class="row"> <div class="row">
<div class="col-lg-3">.col-lg-3</div> <div class="col-md-4">.col-md-4</div>
<div class="col-lg-6">.col-lg-6</div> <div class="col-md-4">.col-md-4</div>
<div class="col-lg-3">.col-lg-3</div> <div class="col-md-4">.col-md-4</div>
</div> </div>
<h4>Two columns</h4> <h3>Three unequal columns</h3>
<p>Get three columns <strong>starting at desktops and scaling to large desktops</strong> of various widths. Remember, grid columns should add up to twelve for a single horizontal block. More than that, and columns start stacking no matter the viewport.</p>
<div class="row"> <div class="row">
<div class="col-lg-8">.col-lg-8</div> <div class="col-md-3">.col-md-3</div>
<div class="col-lg-4">.col-lg-4</div> <div class="col-md-6">.col-md-6</div>
<div class="col-md-3">.col-md-3</div>
</div> </div>
<h4>Full width, single column</h4> <h3>Two columns</h3>
<p>Get two columns <strong>starting at desktops and scaling to large desktops</strong>.</p>
<div class="row">
<div class="col-md-8">.col-md-8</div>
<div class="col-md-4">.col-md-4</div>
</div>
<h3>Full width, single column</h3>
<p class="text-warning">No grid classes are necessary for full-width elements.</p> <p class="text-warning">No grid classes are necessary for full-width elements.</p>
<h4>Two columns with two nested columns</h4> <hr>
<h3>Two columns with two nested columns</h3>
<p>Per the documentation, nesting is easy—just put a row of columns within an existing row. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p>
<p>At mobile device sizes, tablets and down, these columns and their nested columns will stack.</p>
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-md-8">
.col-lg-8 .col-md-8
<div class="row"> <div class="row">
<div class="col-lg-6">.col-lg-6</div> <div class="col-md-6">.col-md-6</div>
<div class="col-lg-6">.col-lg-6</div> <div class="col-md-6">.col-md-6</div>
</div> </div>
</div> </div>
<div class="col-lg-4">.col-lg-4</div> <div class="col-md-4">.col-md-4</div>
</div> </div>
<h4>Mixed: mobile and desktop</h4> <hr>
<h3>Mixed: mobile and desktop</h3>
<p>The Bootstrap 3 grid system has four tiers of classes: xs (phones), sm (tablets), md (desktops), and lg (larger desktops). You can use nearly any combination of these classes to create more dynamic and flexible layouts.</p>
<p>Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.</p>
<div class="row"> <div class="row">
<div class="col-12 col-lg-8">.col-12 .col-lg-8</div> <div class="col-xs-12 col-md-8">.col-xs-12 .col-md-8</div>
<div class="col-6 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
<div class="col-6 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
<div class="col-6 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 col-lg-6">.col-6 .col-lg-6</div> <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
<div class="col-6 col-lg-6">.col-6 .col-lg-6</div> <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
</div> </div>
<h4>Mixed: mobile, tablet, and desktop</h4> <hr>
<h3>Mixed: mobile, tablet, and desktop</h3>
<p></p>
<div class="row"> <div class="row">
<div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div> <div class="col-xs-12 col-sm-8 col-lg-8">.col-xs-12 .col-lg-8</div>
<div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-lg-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
<div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
<div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div> <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
<div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div> <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
</div> </div>
</div> <!-- /container --> </div> <!-- /container -->

2
examples/jumbotron-narrow/index.html
View File

@ -9,7 +9,7 @@
<title>Narrow Jumbotron Template for Bootstrap</title> <title>Narrow Jumbotron Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron-narrow.css" rel="stylesheet"> <link href="jumbotron-narrow.css" rel="stylesheet">

26
examples/jumbotron/index.html
View File

@ -9,7 +9,7 @@
<title>Jumbotron Template for Bootstrap</title> <title>Jumbotron Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron.css" rel="stylesheet"> <link href="jumbotron.css" rel="stylesheet">
@ -19,13 +19,15 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -43,12 +45,12 @@
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form form-inline pull-right"> <form class="navbar-form navbar-right">
<input type="text" placeholder="Email" class="form-control"> <input type="text" placeholder="Email" class="form-control">
<input type="password" placeholder="Password" class="form-control"> <input type="password" placeholder="Password" class="form-control">
<button type="submit" class="btn">Sign in</button> <button type="submit" class="btn">Sign in</button>
</form> </form>
</div><!--/.nav-collapse --> </div><!--/.navbar-collapse -->
</div> </div>
</div> </div>
@ -91,7 +93,7 @@
</div> <!-- /container --> </div> <!-- /container -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

2
examples/justified-nav/index.html
View File

@ -9,7 +9,7 @@
<title>Justified Nav Template for Bootstrap</title> <title>Justified Nav Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="justified-nav.css" rel="stylesheet"> <link href="justified-nav.css" rel="stylesheet">

26
examples/navbar-fixed-top/index.html
View File

@ -9,7 +9,7 @@
<title>Fixed Top Navbar Example for Bootstrap</title> <title>Fixed Top Navbar Example for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-fixed-top.css" rel="stylesheet"> <link href="navbar-fixed-top.css" rel="stylesheet">
@ -20,13 +20,15 @@
<!-- Fixed navbar --> <!-- Fixed navbar -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -38,13 +40,13 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="dropdown-header">Dropdown header</li> <li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li> <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li class="active"><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@ -69,7 +71,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

26
examples/navbar-static-top/index.html
View File

@ -9,7 +9,7 @@
<title>Static Top Navbar Example for Bootstrap</title> <title>Static Top Navbar Example for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-static-top.css" rel="stylesheet"> <link href="navbar-static-top.css" rel="stylesheet">
@ -20,13 +20,15 @@
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar navbar-static-top"> <div class="navbar navbar-static-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -38,13 +40,13 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="dropdown-header">Dropdown header</li> <li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li> <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li class="active"><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@ -70,7 +72,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

26
examples/navbar/index.html
View File

@ -9,7 +9,7 @@
<title>Navbar Template for Bootstrap</title> <title>Navbar Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar.css" rel="stylesheet"> <link href="navbar.css" rel="stylesheet">
@ -22,13 +22,15 @@
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar"> <div class="navbar">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -40,13 +42,13 @@
<li><a href="#">Another action</a></li> <li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li> <li><a href="#">Something else here</a></li>
<li class="divider"></li> <li class="divider"></li>
<li class="dropdown-header">Dropdown header</li> <li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li> <li><a href="#">One more separated link</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav navbar-right">
<li class="active"><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li> <li class="active"><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
<li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li> <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@ -69,7 +71,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

34
examples/offcanvas/index.html
View File

@ -9,7 +9,7 @@
<title>Off Canvas Template for Bootstrap</title> <title>Off Canvas Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="offcanvas.css" rel="stylesheet"> <link href="offcanvas.css" rel="stylesheet">
@ -18,16 +18,15 @@
<body> <body>
<div class="navbar navbar-fixed-top navbar-inverse" role="navigation"> <div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="#">Project name</a>
<a class="navbar-brand" href="#">Project name</a> </div>
<div class="collapse navbar-collapse">
<div class="nav-collapse collapse navbar-responsive-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -40,8 +39,8 @@
<div class="container"> <div class="container">
<div class="row row-offcanvas row-offcanvas-right"> <div class="row row-offcanvas row-offcanvas-right">
<div class="col-12 col-sm-9 col-lg-9"> <div class="col-xs-12 col-sm-9">
<p class="pull-right visible-sm"> <p class="pull-right visible-xs">
<button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas">Toggle nav</button> <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas">Toggle nav</button>
</p> </p>
<div class="jumbotron"> <div class="jumbotron">
@ -81,7 +80,8 @@
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
</div><!--/span--> </div><!--/span-->
<nav class="col-3 col-sm-3 col-lg-3 sidebar-offcanvas" id="sidebar" role="navigation">
<div class="col-xs-12 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
<div class="well sidebar-nav"> <div class="well sidebar-nav">
<ul class="nav"> <ul class="nav">
<li>Sidebar</li> <li>Sidebar</li>
@ -97,7 +97,7 @@
<li><a href="#">Link</a></li> <li><a href="#">Link</a></li>
</ul> </ul>
</div><!--/.well --> </div><!--/.well -->
</nav><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
<hr> <hr>
@ -109,8 +109,8 @@
</div><!--/.container--> </div><!--/.container-->
<!-- jQuery and plugin --> <!-- jQuery and plugin -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="offcanvas.js"></script> <script src="offcanvas.js"></script>
</body> </body>
</html> </html>

12
examples/offcanvas/offcanvas.css
View File

@ -17,7 +17,7 @@ footer {
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
.row-offcanvas { .row-offcanvas {
position: relative; position: relative;
overflow: hidden // Needed for Internet Explorer overflow: hidden; /* Needed for Internet Explorer */
-webkit-transition: all 0.25s ease-out; -webkit-transition: all 0.25s ease-out;
-moz-transition: all 0.25s ease-out; -moz-transition: all 0.25s ease-out;
transition: all 0.25s ease-out; transition: all 0.25s ease-out;
@ -25,24 +25,24 @@ footer {
.row-offcanvas-right .row-offcanvas-right
.sidebar-offcanvas { .sidebar-offcanvas {
right: -58.333333333333336%; // 6 columns right: -58.333333333333336%; /* 6 columns */
} }
.row-offcanvas-left .row-offcanvas-left
.sidebar-offcanvas { .sidebar-offcanvas {
left: -58.333333333333336%; // 6 columns left: -58.333333333333336%; /* 6 columns */
} }
.row-offcanvas-right.active { .row-offcanvas-right.active {
right: 58.333333333333336%; // 6 columns right: 58.333333333333336%; /* 6 columns */
} }
.row-offcanvas-left.active { .row-offcanvas-left.active {
left: 58.333333333333336%; // 6 columns left: 58.333333333333336%; /* 6 columns */
} }
.sidebar-offcanvas { .sidebar-offcanvas {
position: absolute; position: absolute;
width: 58.333333333333336%; // 6 columns width: 58.333333333333336%; /* 6 columns */
} }
} }

2
examples/signin/index.html
View File

@ -9,7 +9,7 @@
<title>Signin Template for Bootstrap</title> <title>Signin Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="signin.css" rel="stylesheet"> <link href="signin.css" rel="stylesheet">

6
examples/signin/signin.css
View File

@ -16,8 +16,7 @@ body {
.form-signin .checkbox { .form-signin .checkbox {
font-weight: normal; font-weight: normal;
} }
.form-signin input[type="text"], .form-signin .form-control {
.form-signin input[type="password"] {
position: relative; position: relative;
font-size: 16px; font-size: 16px;
height: auto; height: auto;
@ -26,8 +25,7 @@ body {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.form-signin input[type="text"]:focus, .form-signin .form-control:focus {
.form-signin input[type="password"]:focus {
z-index: 2; z-index: 2;
} }
.form-signin input[type="text"] { .form-signin input[type="text"] {

22
examples/starter-template/index.html
View File

@ -9,7 +9,7 @@
<title>Starter Template for Bootstrap</title> <title>Starter Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="starter-template.css" rel="stylesheet"> <link href="starter-template.css" rel="stylesheet">
@ -19,13 +19,15 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -44,7 +46,7 @@
</div><!-- /.container --> </div><!-- /.container -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

22
examples/sticky-footer-navbar/index.html
View File

@ -9,7 +9,7 @@
<title>Sticky Footer Navbar Template for Bootstrap</title> <title>Sticky Footer Navbar Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer-navbar.css" rel="stylesheet"> <link href="sticky-footer-navbar.css" rel="stylesheet">
@ -23,13 +23,15 @@
<!-- Fixed navbar --> <!-- Fixed navbar -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="container"> <div class="container">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <div class="navbar-header">
<span class="icon-bar"></span> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> <span class="icon-bar"></span>
<a class="navbar-brand" href="#">Project name</a> </button>
<div class="nav-collapse collapse"> <a class="navbar-brand" href="#">Project name</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
@ -69,7 +71,7 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<script src="../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../bootstrap/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

2
examples/sticky-footer/index.html
View File

@ -9,7 +9,7 @@
<title>Sticky Footer Template for Bootstrap</title> <title>Sticky Footer Template for Bootstrap</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer.css" rel="stylesheet"> <link href="sticky-footer.css" rel="stylesheet">

87
getting-started.html
View File

@ -93,7 +93,7 @@ bootstrap/
<div class="page-header"> <div class="page-header">
<h1 id="template">Basic template</h1> <h1 id="template">Basic template</h1>
</div> </div>
<p class="lead">Make use of a super basic HTML template, or dive into a <a href="{{ site.examples }}">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p> <p class="lead">Make use of a super basic HTML template, or dive into a <a href="../getting-started#examples">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
<p>Copy and paste the HTML from below to get started with a bare bones Bootstrap document.</p> <p>Copy and paste the HTML from below to get started with a bare bones Bootstrap document.</p>
{% highlight html %} {% highlight html %}
@ -125,6 +125,91 @@ bootstrap/
<!-- Template
================================================== -->
<div class="bs-docs-section">
<div class="page-header">
<h1 id="examples">Examples</h1>
</div>
<p class="lead">Build on the basic template above with Bootstrap's many components. Check out some of the more advanced tips for how to customize and build on top of them.</p>
<div class="row">
<div class="col-xs-6 col-md-4">
<a href="../examples/carousel/">
Carousel
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/grid/">
Grids
</a>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a href="../examples/jumbotron/">
Jumbotron
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/jumbotron-narrow/">
Narrow jumbotron
</a>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a href="../examples/navbar/">
Navbar
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/navbar-static-top/">
Static navbar
</a>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a href="../examples/navbar-fixed-top/">
Fixed navbar
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/offcanvas/">
Offcanvas
</a>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a href="../examples/signin/">
Sign-in page
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/sticky-footer/">
Sticky footer
</a>
</div>
<div class="clearfix visible-xs"></div>
<div class="col-xs-6 col-md-4">
<a href="../examples/sticky-footer-navbar/">
Sticky footer with navbar
</a>
</div>
<div class="col-xs-6 col-md-4">
<a href="../examples/starter-template/">
Starter template
</a>
</div>
</div>
</div>
<!-- Template <!-- Template
================================================== --> ================================================== -->
<div class="bs-docs-section"> <div class="bs-docs-section">