Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/tests/unit/bootstrap-collapse.js

12 files changed, 197 insertions, 166 deletions

diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 598a6334b..cd6855aab 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -27,37 +27,6 @@ body {
   left: 0;
   right: 0;
   z-index: 10;
-  margin-top: 20px;
-  margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
-}
-.navbar-wrapper .navbar {
-
-}
-
-/* Remove border and change up box shadow for more contrast */
-.navbar .navbar-inner {
-  border: 0;
-  -webkit-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-     -moz-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-          box-shadow: 0 2px 10px rgba(0,0,0,.25);
-}
-
-/* Downsize the brand/project name a bit */
-.navbar .brand {
-  padding: 14px 20px 16px; /* Increase vertical padding to match navbar links */
-  font-size: 16px;
-  font-weight: bold;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.5);
-}
-
-/* Navbar links: increase padding for taller navbar */
-.navbar .nav > li > a {
-  padding: 15px 20px;
-}
-
-/* Offset the responsive button for proper vertical alignment */
-.navbar .navbar-toggle {
-  margin-top: 10px;
 }
 
 
@@ -69,22 +38,12 @@ body {
 .carousel {
   margin-bottom: 60px;
 }
-
-.carousel .container {
-  position: relative;
-  z-index: 9;
-}
-
-.carousel-control {
-  height: 80px;
-  margin-top: 0;
-  font-size: 120px;
-  text-shadow: 0 1px 1px rgba(0,0,0,.4);
-  background-color: transparent;
-  border: 0;
+/* Since positioning the image, we need to help out the caption */
+.carousel-caption {
   z-index: 10;
 }
 
+/* Declare heights because of positioning of img element */
 .carousel .item {
   height: 500px;
 }
@@ -96,37 +55,26 @@ body {
   height: 500px;
 }
 
-.carousel-caption {
-  background-color: transparent;
-  position: static;
-  max-width: 550px;
-  padding: 0 20px;
-  margin-top: 200px;
-}
-.carousel-caption h1,
-.carousel-caption .lead {
-  margin: 0;
-  line-height: 1.25;
-  color: #fff;
-  text-shadow: 0 1px 1px rgba(0,0,0,.4);
-}
-.carousel-caption .btn {
-  margin-top: 10px;
-}
-
 
 
 /* MARKETING CONTENT
 -------------------------------------------------- */
 
+/* Pad the edges of the mobile views a bit */
+.marketing {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
 /* Center align the text within the three columns below the carousel */
-.marketing .col-span-4 {
+.marketing .col-lg-4 {
   text-align: center;
+  margin-bottom: 20px;
 }
 .marketing h2 {
   font-weight: normal;
 }
-.marketing .col-span-4 p {
+.marketing .col-lg-4 p {
   margin-left: 10px;
   margin-right: 10px;
 }
@@ -167,16 +115,40 @@ body {
 /* RESPONSIVE CSS
 -------------------------------------------------- */
 
-@media (max-width: 979px) {
+@media (min-width: 768px) {
+
+  /* Remve the edge padding needed for mobile */
+  .marketing {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  /* Navbar positioning foo */
+  .navbar-wrapper {
+    margin-top: 20px;
+    margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
+  }
+  /* The navbar becomes detached from the top, so we round the corners */
+  .navbar-wrapper .navbar {
+    border-radius: 4px;
+  }
+
+  /* Bump up size of carousel content */
+  .carousel-caption p {
+    margin-bottom: 20px;
+    font-size: 21px;
+    line-height: 1.4;
+  }
+
+}
+
+
+/*@media (max-width: 979px) {
 
   .container.navbar-wrapper {
     margin-bottom: 0;
     width: auto;
   }
-  .navbar-inner {
-    border-radius: 0;
-    margin: -20px 0;
-  }
 
   .carousel .item {
     height: 500px;
@@ -202,10 +174,6 @@ body {
 
 @media (max-width: 767px) {
 
-  .navbar-inner {
-    margin: -20px;
-  }
-
   .carousel {
     margin-left: -20px;
     margin-right: -20px;
@@ -244,7 +212,19 @@ body {
     line-height: 1.5;
   }
 
-}
+  .navbar-wrapper {
+    margin-top: 0;
+  }
+
+  .navbar {
+    border-radius: 0;
+  }
+
+  #myCarousel {
+    margin-top: 54px;
+  }
+
+}*/
 </style>
 
 
@@ -252,25 +232,21 @@ body {
 <!-- NAVBAR
 ================================================== -->
 <div class="navbar-wrapper">
-  <!-- Wrap the .navbar in .container to center it within the absolutely positioned parent. -->
   <div class="container">
 
-    <div class="navbar navbar-inverse">
-      <div class="navbar-inner">
-        <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
+    <div class="navbar navbar-inverse navbar-static-top">
+      <div class="container">
+	    <a class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	      <span class="icon-bar"></span>
+	    </a>
         <a class="navbar-brand" href="#">Project name</a>
-        <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <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>
-            <!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -284,52 +260,57 @@ body {
               </ul>
             </li>
           </ul>
-        </div><!--/.nav-collapse -->
-      </div><!-- /.navbar-inner -->
-    </div><!-- /.navbar -->
-
-  </div> <!-- /.container -->
-</div><!-- /.navbar-wrapper -->
+        </div>
+      </div>
+    </div>
 
+  </div>
+</div>
 
 
 <!-- Carousel
 ================================================== -->
 <div id="myCarousel" class="carousel slide">
+  <!-- Indicators -->
+  <ol class="carousel-indicators">
+    <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+    <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="item active">
-      <img src="../assets/img/examples/slide-01.jpg" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:First slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Example headline.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Sign up today</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Sign up today</a></p>
         </div>
       </div>
     </div>
     <div class="item">
-      <img src="../assets/img/examples/slide-02.jpg" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Second slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>Another example headline.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Learn more</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Learn more</a></p>
         </div>
       </div>
     </div>
     <div class="item">
-      <img src="../assets/img/examples/slide-03.jpg" alt="">
+      <img data-src="holder.js/1500x500/auto/#777:#7a7a7a/text:Third slide" alt="">
       <div class="container">
         <div class="carousel-caption">
           <h1>One more for good measure.</h1>
-          <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-          <a class="btn btn-large btn-primary" href="#">Browse gallery</a>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a class="btn btn-large btn-primary" href="#">Browse gallery</a></p>
         </div>
       </div>
     </div>
   </div>
-  <a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>
-  <a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>
+  <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>
 </div><!-- /.carousel -->
 
 
@@ -342,24 +323,24 @@ body {
 
   <!-- Three columns of text below the carousel -->
   <div class="row">
-    <div class="col-span-4">
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
-      <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+      <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
-    <div class="col-span-4">
+    </div><!-- /.col-lg-4 -->
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
-      <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
+      <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
-    <div class="col-span-4">
+    </div><!-- /.col-lg-4 -->
+    <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.col-span-4 -->
+    </div><!-- /.col-lg-4 -->
   </div><!-- /.row -->
 
 
@@ -368,24 +349,24 @@ body {
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-chrome.png">
-    <h2 class="featurette-heading">First featurette headling. <span class="muted">It'll blow your mind.</span></h2>
+    <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
+    <h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
 
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-left" src="../assets/img/examples/browser-icon-firefox.png">
-    <h2 class="featurette-heading">Oh yeah, it's that good. <span class="muted">See for yourself.</span></h2>
+    <img class="featurette-image img-circle pull-left" data-src="holder.js/512x512">
+    <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
 
   <hr class="featurette-divider">
 
   <div class="featurette">
-    <img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-safari.png">
-    <h2 class="featurette-heading">And lastly, this one. <span class="muted">Checkmate.</span></h2>
+    <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
+    <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Checkmate.</span></h2>
     <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
   </div>
 
diff --git a/docs/examples/grid.html b/docs/examples/grid.html
new file mode 100644
index 000000000..580f69cbf
--- /dev/null
+++ b/docs/examples/grid.html
@@ -0,0 +1,56 @@
+---
+layout: example
+title: Grid template
+---
+
+<!-- Custom styles for this template -->
+<style>
+
+  .container {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+  .row {
+    margin-bottom: 20px;
+    margin-left: -15px;
+    margin-right: -15px;
+  }
+  [class*="col-lg-"] {
+    padding-top: 15px;
+    padding-bottom: 15px;
+    background-color: #f5f5f5;
+    border: 1px solid #e5e5e5;
+  }
+</style>
+
+
+<div class="container">
+
+  <h2>Bootstrap grids</h2>
+  <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 col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Three unequal columns</h4>
+  <div class="row">
+    <div class="col col-lg-3">.col .col-lg-3</div>
+    <div class="col col-lg-6">.col .col-lg-6</div>
+    <div class="col col-lg-3">.col .col-lg-3</div>
+  </div>
+
+  <h4>Two columns</h4>
+  <div class="row">
+    <div class="col col-lg-8">.col .col-lg-8</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Full width, single column</h4>
+  <p class="text-muted">No grid classes are necessary for full-width elements.</p>
+
+</div> <!-- /container -->
diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html
index abf07dc72..a6fd4e950 100644
--- a/docs/examples/jumbotron-narrow.html
+++ b/docs/examples/jumbotron-narrow.html
@@ -94,7 +94,7 @@ title: Narrow page template
       <li><a href="#">About</a></li>
       <li><a href="#">Contact</a></li>
     </ul>
-    <h3 class="muted">Project name</h3>
+    <h3 class="text-muted">Project name</h3>
   </div>
 
   <div class="jumbotron">
@@ -104,7 +104,7 @@ title: Narrow page template
   </div>
 
   <div class="row marketing">
-    <div class="col-span-6">
+    <div class="col col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
@@ -115,7 +115,7 @@ title: Narrow page template
       <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
     </div>
 
-    <div class="col-span-6">
+    <div class="col col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html
index 86d035f07..3982a34d9 100644
--- a/docs/examples/jumbotron.html
+++ b/docs/examples/jumbotron.html
@@ -46,7 +46,7 @@ title: Jumbotron template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <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>
@@ -85,17 +85,17 @@ title: Jumbotron template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
       </div>
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
      </div>
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html
index 7013b150e..fdd706a8f 100644
--- a/docs/examples/justified-nav.html
+++ b/docs/examples/justified-nav.html
@@ -42,7 +42,7 @@ title: Justified nav template
     border-radius: 5px;
     border: 1px solid #ccc;
   }
-  .nav-justified li a {
+  .nav-justified > li > a {
     padding-top: 15px;
     padding-bottom: 15px;
     color: #777;
@@ -60,17 +60,17 @@ title: Justified nav template
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
     background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
   }
-  .nav-justified .active a {
+  .nav-justified > .active > a {
     background-color: #ddd;
     background-image: none;
     box-shadow: inset 0 3px 7px rgba(0,0,0,.15);
   }
-  .nav-justified li:first-child a {
+  .nav-justified > li:first-child > a {
     border-left: 0;
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
   }
-  .nav-justified li:last-child a {
+  .nav-justified > li:last-child > a {
     border-right: 0;
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
@@ -86,7 +86,6 @@ title: Justified nav template
       padding-left: 0;
       padding-right: 0;
     }
-    /* Make the nav on the same line */
   }
 
 </style>
@@ -96,8 +95,8 @@ title: Justified nav template
 <div class="container">
 
   <div class="masthead">
-    <h3 class="muted">Project name</h3>
-    <ul class="nav nav-justified">
+    <h3 class="text-muted">Project name</h3>
+    <ul class="nav navbar-nav nav-justified">
       <li class="active"><a href="#">Home</a></li>
       <li><a href="#">Projects</a></li>
       <li><a href="#">Services</a></li>
@@ -119,17 +118,17 @@ title: Justified nav template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
       </div>
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
      </div>
-      <div class="col-span-4">
+      <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html
index e1f1c882a..d56cadfac 100644
--- a/docs/examples/navbar-fixed-top.html
+++ b/docs/examples/navbar-fixed-top.html
@@ -27,7 +27,7 @@ title: Fixed navbar template
         </a>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <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>
@@ -44,7 +44,7 @@ title: Fixed navbar template
               </ul>
             </li>
           </ul>
-          <ul class="nav pull-right">
+          <ul class="nav navbar-nav pull-right">
             <li><a href="/examples/navbar/">Default</a></li>
             <li><a href="/examples/navbar-static-top/">Static top</a></li>
             <li class="active"><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
@@ -60,7 +60,7 @@ title: Fixed navbar template
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 
diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html
index 2679a670b..065d16d5f 100644
--- a/docs/examples/navbar-static-top.html
+++ b/docs/examples/navbar-static-top.html
@@ -23,7 +23,7 @@ title: Static navbar template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <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>
@@ -40,11 +40,11 @@ title: Static navbar template
           </ul>
         </li>
       </ul>
-    <ul class="nav pull-right">
-      <li><a href="/examples/navbar/">Default</a></li>
-      <li class="active"><a href="/examples/navbar-static-top/">Static top</a></li>
-      <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
-    </ul>
+      <ul class="nav navbar-nav pull-right">
+        <li><a href="/examples/navbar/">Default</a></li>
+        <li class="active"><a href="/examples/navbar-static-top/">Static top</a></li>
+        <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
+      </ul>
     </div><!--/.nav-collapse -->
   </div>
 </div>
@@ -57,7 +57,7 @@ title: Static navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html
index 6cba51dc5..4c0f9938b 100644
--- a/docs/examples/navbar.html
+++ b/docs/examples/navbar.html
@@ -29,7 +29,7 @@ title: Navbar template
       </a>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <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>
@@ -46,7 +46,7 @@ title: Navbar template
             </ul>
           </li>
         </ul>
-        <ul class="nav pull-right">
+        <ul class="nav navbar-nav pull-right">
           <li class="active"><a href="/examples/navbar/">Default</a></li>
           <li><a href="/examples/navbar-static-top/">Static top</a></li>
           <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
@@ -60,7 +60,7 @@ title: Navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 
diff --git a/docs/examples/signin.html b/docs/examples/signin.html
index ce3d312dc..92db3e036 100644
--- a/docs/examples/signin.html
+++ b/docs/examples/signin.html
@@ -13,8 +13,8 @@ title: Sign in form template
   }
 
   .form-signin {
-    max-width: 300px;
-    padding: 30px;
+    max-width: 330px;
+    padding: 15px;
     margin: 0 auto;
   }
   .form-signin .form-signin-heading,
diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html
index 62da929da..18fdaf5fc 100644
--- a/docs/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -24,7 +24,7 @@ title: Starter template
     </button>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <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>
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html
index b00bfd5ab..fe6681ef6 100644
--- a/docs/examples/sticky-footer-navbar.html
+++ b/docs/examples/sticky-footer-navbar.html
@@ -22,14 +22,13 @@ title: Sticky footer with navbar template
     height: 100%;
     /* Negative indent footer by its height */
     margin: 0 auto -60px;
+    /* Pad bottom by footer height */
+    padding: 0 0 60px;
   }
 
   /* Set the fixed height of the footer here */
-  #push,
   #footer {
     height: 60px;
-  }
-  #footer {
     background-color: #f5f5f5;
   }
 
@@ -50,7 +49,7 @@ title: Sticky footer with navbar template
   /* Not required for template or sticky footer method. */
 
   #wrap > .container {
-    padding-top: 60px;
+    padding: 60px 15px 0;
   }
   .container .credit {
     margin: 20px 0;
@@ -77,7 +76,7 @@ title: Sticky footer with navbar template
       </button>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <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>
@@ -104,14 +103,12 @@ title: Sticky footer with navbar template
       <h1>Sticky footer with fixed navbar</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within <code>#wrap</code> with <code>padding-top: 60px;</code> on the <code>.container</code>.</p>
-    <p>Back to <a href="./sticky-footer.html">the default sticky footer</a> minus the navbar.</p>
+    <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
   </div>
-
-  <div id="push"></div>
 </div>
 
 <div id="footer">
   <div class="container">
-    <p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+    <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
   </div>
 </div>
diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html
index 722d3aa19..14fc1edeb 100644
--- a/docs/examples/sticky-footer.html
+++ b/docs/examples/sticky-footer.html
@@ -22,14 +22,13 @@ title: Sticky footer template
     height: 100%;
     /* Negative indent footer by its height */
     margin: 0 auto -60px;
+    /* Pad bottom by footer height */
+    padding: 0 0 60px;
   }
 
   /* Set the fixed height of the footer here */
-  #push,
   #footer {
     height: 60px;
-  }
-  #footer {
     background-color: #f5f5f5;
   }
 
@@ -50,6 +49,7 @@ title: Sticky footer template
   .container {
     width: auto;
     max-width: 680px;
+    padding: 0 15px;
   }
   .container .credit {
     margin: 20px 0;
@@ -68,14 +68,12 @@ title: Sticky footer template
       <h1>Sticky footer</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
-    <p>Use <a href="./sticky-footer-navbar.html">the sticky footer with a fixed navbar</a> if need be, too.</p>
+    <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
   </div>
-
-  <div id="push"></div>
 </div>
 
 <div id="footer">
   <div class="container">
-    <p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+    <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
   </div>
 </div>