Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip

97cbefa7 · Marcus Schwab · bd19b42c · a0cd886c · 97cbefa7 · 97cbefa7
Commit 97cbefa7 authored Jun 11, 2012 by Marcus Schwab
20 changed files
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3169,10 +3169,6 @@ input[type="submit"].btn.btn-mini {
          border-radius: 4px;
 }
-.alert-heading {
-  color: inherit;
-}
 .alert .close {
  position: relative;
  top: -2px;

--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -12,18 +12,18 @@
 body {
  position: relative;
-  padding-top: 40px;
+  padding-top: 100px;
  font-size: 14px;
  background-color: #fff;
  background-image: url(../img/grid-20px.png);
  background-repeat: repeat-x;
-  background-position: 0 0;
+  background-position: 0 40px;
 }
 /* Custom container for the narrow docs */
 .bs-docs-container {
  max-width: 780px;
-  margin: 0 0 0 240px;
+  margin: 0 auto;
 }
 /* Increase docs base type size and line-heights */
@@ -37,12 +37,44 @@ li {
  line-height: 25px;
 }
+/* Code in headings */
+h3 code {
+  font-size: 14px;
+  font-weight: normal;
+}
+/* Tweak navbar brand link to be super sleek
+-------------------------------------------------- */
+.navbar,
+.subnav {
+  font-size: 13px;
+}
+body > .navbar-fixed-top .brand {
+  padding-right: 0;
+  padding-left: 0;
+  margin-left: 20px;
+  float: right;
+  font-weight: bold;
+  color: #000;
+  text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+          transition: all .2s linear;
+}
+body > .navbar-fixed-top .brand:hover {
+  text-decoration: none;
+}
 /* Left nav
 -------------------------------------------------- */
 .bs-docs-nav {
+  display: none;
  position: fixed;
  top: 0;
  left: 0;
@@ -149,6 +181,7 @@ hr.soften {
 ------------------------- */
 .jumbotron {
  position: relative;
+  text-align: center;
 }
 .jumbotron h1 {
  margin-bottom: 10px;
@@ -177,7 +210,8 @@ hr.soften {
 /* Masthead (docs home)
 ------------------------- */
 .masthead {
-  margin-bottom: 60px;
+  margin-top: 20px;
+  margin-bottom: 80px;
 }
 .masthead h1,
 .masthead p {
@@ -224,12 +258,16 @@ hr.soften {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
+  text-align: left;
 }
 .subhead h1 {
  font-size: 60px;
 }
 .subhead .lead {
+  margin-bottom: 30px;
  line-height: 25px;
+  font-size: 30px;
+  line-height: 40px;
 }
 /* Subnav */
@@ -314,7 +352,7 @@ hr.soften {
    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
  }
  .subnav-fixed .nav {
-    width: 938px;
+    max-width: 780px;
    margin: 0 auto;
    padding: 0 1px;
  }
@@ -338,6 +376,7 @@ hr.soften {
  margin: 36px 0 27px;
  font-size: 40px;
  font-weight: 300;
+  text-align: center;
 }
 .marketing h2,
 .marketing h3 {
@@ -364,6 +403,7 @@ hr.soften {
  font-weight: 300;
  line-height: 24px;
  color: #999;
+  text-align: center;
 }
@@ -421,8 +461,12 @@ hr.soften {
     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.075);
          box-shadow: 0 1px 2px rgba(0,0,0,.075);
 }
+.mini-layout,
+.mini-layout .mini-layout-body,
+.mini-layout.fluid .mini-layout-sidebar {
+  height: 300px;
+}
 .mini-layout {
-  height: 240px;
  margin-bottom: 20px;
  padding: 9px;
 }
@@ -435,7 +479,6 @@ hr.soften {
  background-color: #dceaf4;
  margin: 0 auto;
  width: 70%;
-  height: 240px;
 }
 .mini-layout.fluid .mini-layout-sidebar,
 .mini-layout.fluid .mini-layout-header,
@@ -445,7 +488,6 @@ hr.soften {
 .mini-layout.fluid .mini-layout-sidebar {
  background-color: #bbd8e9;
  width: 20%;
-  height: 240px;
 }
 .mini-layout.fluid .mini-layout-body {
  width: 77.5%;
@@ -598,6 +640,9 @@ h2 + .row {
 }
 /* Example sites showcase */
+.example-sites {
+  margin-left: 20px;
+}
 .example-sites img {
  max-width: 100%;
  margin: 0 auto;
@@ -694,9 +739,45 @@ form.well {
 .bs-docs-example p:last-child {
  margin-bottom: 0;
 }
-.bs-docs-example .table {
+.bs-docs-example .table,
+.bs-docs-example .progress,
+.bs-docs-example .well,
+.bs-docs-example .alert,
+.bs-docs-example .hero-unit,
+.bs-docs-example .pagination,
+.bs-docs-example .navbar,
+.bs-docs-example .nav {
  margin-bottom: 5px;
 }
+.bs-docs-example .pagination {
+  margin-top: 0;
+}
+.bs-navbar-top-example,
+.bs-navbar-bottom-example {
+  z-index: 1;
+  padding: 0;
+  height: 90px;
+}
+.bs-navbar-top-example {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+.bs-navbar-top-example:after {
+  top: auto;
+  bottom: -1px;
+  -webkit-border-radius: 0 4px 0 4px;
+     -moz-border-radius: 0 4px 0 4px;
+          border-radius: 0 4px 0 4px;
+}
+.bs-navbar-bottom-example {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+.bs-navbar-bottom-example .navbar {
+  margin-bottom: 0;
+}
 form.bs-docs-example {
  padding-bottom: 19px;
 }
@@ -772,13 +853,6 @@ form.bs-docs-example {
  border: 1px solid #d6e9c6;
 }
-/* Grid examples
------------------------- */
-.bs-docs-grid {
-  width: 940px;
-  margin-left: -80px;
-}
 /* Responsive Docs
@@ -886,7 +960,7 @@ form.bs-docs-example {
  /* Jumbotron buttons */
  .jumbotron .btn {
    margin-bottom: 10px;
-  }
+av  }
  /* Subnav */
  .subnav {
@@ -988,14 +1062,13 @@ form.bs-docs-example {
 /* LARGE DESKTOP SCREENS */
 @media (min-width: 1210px) {
-  /* Update subnav container */
+  .bs-docs-container {
-  .subnav-fixed .nav {
+    max-width: 970px;
-    width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
  }
-  .bs-docs-grid {
+  /* Update subnav container */
-    width: 1170px;
+  .subnav-fixed .nav {
-    margin-left: -195px;
+    max-width: 970px; /* 2px less to account for left/right borders being removed when in fixed mode */
  }
 }
--- a/docs/base-css.html
+++ b/docs/base-css.html
--- a/docs/components.html
+++ b/docs/components.html
--- a/docs/download.html
+++ b/docs/download.html
@@ -27,84 +27,50 @@
  </head>
-  <body>
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
-    <div class="bs-docs-nav">
+    <!-- Navbar
-      <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
+    ================================================== -->
-      <ul class="bs-nav">
+    <div class="navbar navbar-fixed-top">
-        <li class="">
+      <div class="navbar-inner">
-          <a href="./scaffolding.html">Scaffolding</a>
+        <div class="bs-docs-container">
-          <ul>
+          <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <li><a href="./scaffolding.html#global">Global styles</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
+          </button>
-            <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <a class="brand" href="./index.html">Bootstrap</a>
-            <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+          <div class="nav-collapse collapse">
-          </ul>
+            <ul class="nav">
-        </li>
+              <li class="">
-        <li class="">
+                <a href="./index.html">Home</a>
-          <a href="./base-css.html">Base CSS</a>
+              </li>
-          <ul>
+              <li class="">
-            <li><a href="./base-css.html#typography">Typography</a></li>
+                <a href="./scaffolding.html">Scaffolding</a>
-            <li><a href="./base-css.html#code">Code</a></li>
+              </li>
-            <li><a href="./base-css.html#tables">Tables</a></li>
+              <li class="">
-            <li><a href="./base-css.html#forms">Forms</a></li>
+                <a href="./base-css.html">Base CSS</a>
-            <li><a href="./base-css.html#buttons">Buttons</a></li>
+              </li>
-            <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              <li class="">
-          </ul>
+                <a href="./components.html">Components</a>
-        </li>
+              </li>
-        <li class="">
+              <li class="">
-          <a href="./components.html">Components</a>
+                <a href="./javascript.html">Javascript</a>
-          <ul>
+              </li>
-            <li><a href="./components.html#buttonGroups">Button groups</a></li>
+              <li class="">
-            <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+                <a href="./less.html">LESS</a>
-            <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+              </li>
-            <li><a href="./components.html#navbar">Navbar</a></li>
+              <li class="divider-vertical"></li>
-            <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+              <li class="active">
-            <li><a href="./components.html#pagination">Pagination</a></li>
+                <a href="./download.html">Customize</a>
-            <li><a href="./components.html#labels">Labels</a></li>
+              </li>
-            <li><a href="./components.html#badges">Badges</a></li>
+              <li class="">
-            <li><a href="./components.html#typography">Typography</a></li>
+                <a href="./examples.html">Examples</a>
-            <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+              </li>
-            <li><a href="./components.html#alerts">Alerts</a></li>
+            </ul>
-            <li><a href="./components.html#progress">Progress bars</a></li>
+          </div>
-            <li><a href="./components.html#misc">Miscellaneous</a></li>
+        </div>
-          </ul>
+      </div>
-        </li>
-        <li class="">
-          <a href="./javascript.html">Javascript</a>
-          <ul>
-            <li><a href="./javascript.html#javascript">All plugins</a></li>
-            <li><a href="./javascript.html#modals">Modal</a></li>
-            <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-            <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-            <li><a href="./javascript.html#tabs">Tab</a></li>
-            <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-            <li><a href="./javascript.html#popovers">Popover</a></li>
-            <li><a href="./javascript.html#alerts">Alert</a></li>
-            <li><a href="./javascript.html#buttons">Button</a></li>
-            <li><a href="./javascript.html#collapse">Collapse</a></li>
-            <li><a href="./javascript.html#carousel">Carousel</a></li>
-            <li><a href="./javascript.html#typeahead">Typeahead</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./less.html">LESS</a>
-          <ul>
-            <li><a href="./less.html#builtWith">Built with Less</a></li>
-            <li><a href="./less.html#variables">Variables</a></li>
-            <li><a href="./less.html#mixins">Mixins</a></li>
-            <li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
-          </ul>
-        </li>
-        <li class="active">
-          <a href="./download.html">Customize</a>
-        </li>
-        <li class="">
-          <a href="./examples.html">Examples</a>
-        </li>
-      </ul>
    </div>
    <div class="bs-docs-container">
@@ -114,22 +80,18 @@
 <header class="jumbotron subhead" id="overview">
  <h1>Customize and download</h1>
  <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#components">1. Choose components</a></li>
+      <li><a href="#plugins">2. Select jQuery plugins</a></li>
+      <li><a href="#variables">3. Customize variables</a></li>
+      <li><a href="#download">4. Download</a></li>
+    </ul>
+  </div>
 </header>
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>Contents</h3>
-    <ol>
-      <li><a href="#components">Choose components</a></li>
-      <li><a href="#plugins">Select jQuery plugins</a></li>
-      <li><a href="#variables">Customize variables</a></li>
-      <li><a href="#download">Download</a></li>
-    </ol>
-  </div>
-</section>
 <form>
  <section class="download" id="components">
    <div class="page-header">
@@ -466,7 +428,7 @@
        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
      </footer>
-    </div><!-- /container -->
+    </div>

--- a/docs/examples.html
+++ b/docs/examples.html
@@ -27,84 +27,50 @@
  </head>
-  <body>
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
-    <div class="bs-docs-nav">
+    <!-- Navbar
-      <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
+    ================================================== -->
-      <ul class="bs-nav">
+    <div class="navbar navbar-fixed-top">
-        <li class="">
+      <div class="navbar-inner">
-          <a href="./scaffolding.html">Scaffolding</a>
+        <div class="bs-docs-container">
-          <ul>
+          <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <li><a href="./scaffolding.html#global">Global styles</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
+          </button>
-            <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <a class="brand" href="./index.html">Bootstrap</a>
-            <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+          <div class="nav-collapse collapse">
-          </ul>
+            <ul class="nav">
-        </li>
+              <li class="">
-        <li class="">
+                <a href="./index.html">Home</a>
-          <a href="./base-css.html">Base CSS</a>
+              </li>
-          <ul>
+              <li class="">
-            <li><a href="./base-css.html#typography">Typography</a></li>
+                <a href="./scaffolding.html">Scaffolding</a>
-            <li><a href="./base-css.html#code">Code</a></li>
+              </li>
-            <li><a href="./base-css.html#tables">Tables</a></li>
+              <li class="">
-            <li><a href="./base-css.html#forms">Forms</a></li>
+                <a href="./base-css.html">Base CSS</a>
-            <li><a href="./base-css.html#buttons">Buttons</a></li>
+              </li>
-            <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              <li class="">
-          </ul>
+                <a href="./components.html">Components</a>
-        </li>
+              </li>
-        <li class="">
+              <li class="">
-          <a href="./components.html">Components</a>
+                <a href="./javascript.html">Javascript</a>
-          <ul>
+              </li>
-            <li><a href="./components.html#buttonGroups">Button groups</a></li>
+              <li class="">
-            <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+                <a href="./less.html">LESS</a>
-            <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+              </li>
-            <li><a href="./components.html#navbar">Navbar</a></li>
+              <li class="divider-vertical"></li>
-            <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+              <li class="">
-            <li><a href="./components.html#pagination">Pagination</a></li>
+                <a href="./download.html">Customize</a>
-            <li><a href="./components.html#labels">Labels</a></li>
+              </li>
-            <li><a href="./components.html#badges">Badges</a></li>
+              <li class="active">
-            <li><a href="./components.html#typography">Typography</a></li>
+                <a href="./examples.html">Examples</a>
-            <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+              </li>
-            <li><a href="./components.html#alerts">Alerts</a></li>
+            </ul>
-            <li><a href="./components.html#progress">Progress bars</a></li>
+          </div>
-            <li><a href="./components.html#misc">Miscellaneous</a></li>
+        </div>
-          </ul>
+      </div>
-        </li>
-        <li class="">
-          <a href="./javascript.html">Javascript</a>
-          <ul>
-            <li><a href="./javascript.html#javascript">All plugins</a></li>
-            <li><a href="./javascript.html#modals">Modal</a></li>
-            <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-            <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-            <li><a href="./javascript.html#tabs">Tab</a></li>
-            <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-            <li><a href="./javascript.html#popovers">Popover</a></li>
-            <li><a href="./javascript.html#alerts">Alert</a></li>
-            <li><a href="./javascript.html#buttons">Button</a></li>
-            <li><a href="./javascript.html#collapse">Collapse</a></li>
-            <li><a href="./javascript.html#carousel">Carousel</a></li>
-            <li><a href="./javascript.html#typeahead">Typeahead</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./less.html">LESS</a>
-          <ul>
-            <li><a href="./less.html#builtWith">Built with Less</a></li>
-            <li><a href="./less.html#variables">Variables</a></li>
-            <li><a href="./less.html#mixins">Mixins</a></li>
-            <li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./download.html">Customize</a>
-        </li>
-        <li class="active">
-          <a href="./examples.html">Examples</a>
-        </li>
-      </ul>
    </div>
    <div class="bs-docs-container">
@@ -151,7 +117,7 @@
        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
      </footer>
-    </div><!-- /container -->
+    </div>

--- a/docs/index.html
+++ b/docs/index.html
@@ -27,84 +27,50 @@
  </head>
-  <body>
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
-    <div class="bs-docs-nav">
+    <!-- Navbar
-      <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
+    ================================================== -->
-      <ul class="bs-nav">
+    <div class="navbar navbar-fixed-top">
-        <li class="">
+      <div class="navbar-inner">
-          <a href="./scaffolding.html">Scaffolding</a>
+        <div class="bs-docs-container">
-          <ul>
+          <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <li><a href="./scaffolding.html#global">Global styles</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
+          </button>
-            <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <a class="brand" href="./index.html">Bootstrap</a>
-            <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+          <div class="nav-collapse collapse">
-          </ul>
+            <ul class="nav">
-        </li>
+              <li class="active">
-        <li class="">
+                <a href="./index.html">Home</a>
-          <a href="./base-css.html">Base CSS</a>
+              </li>
-          <ul>
+              <li class="">
-            <li><a href="./base-css.html#typography">Typography</a></li>
+                <a href="./scaffolding.html">Scaffolding</a>
-            <li><a href="./base-css.html#code">Code</a></li>
+              </li>
-            <li><a href="./base-css.html#tables">Tables</a></li>
+              <li class="">
-            <li><a href="./base-css.html#forms">Forms</a></li>
+                <a href="./base-css.html">Base CSS</a>
-            <li><a href="./base-css.html#buttons">Buttons</a></li>
+              </li>
-            <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              <li class="">
-          </ul>
+                <a href="./components.html">Components</a>
-        </li>
+              </li>
-        <li class="">
+              <li class="">
-          <a href="./components.html">Components</a>
+                <a href="./javascript.html">Javascript</a>
-          <ul>
+              </li>
-            <li><a href="./components.html#buttonGroups">Button groups</a></li>
+              <li class="">
-            <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+                <a href="./less.html">LESS</a>
-            <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+              </li>
-            <li><a href="./components.html#navbar">Navbar</a></li>
+              <li class="divider-vertical"></li>
-            <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+              <li class="">
-            <li><a href="./components.html#pagination">Pagination</a></li>
+                <a href="./download.html">Customize</a>
-            <li><a href="./components.html#labels">Labels</a></li>
+              </li>
-            <li><a href="./components.html#badges">Badges</a></li>
+              <li class="">
-            <li><a href="./components.html#typography">Typography</a></li>
+                <a href="./examples.html">Examples</a>
-            <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+              </li>
-            <li><a href="./components.html#alerts">Alerts</a></li>
+            </ul>
-            <li><a href="./components.html#progress">Progress bars</a></li>
+          </div>
-            <li><a href="./components.html#misc">Miscellaneous</a></li>
+        </div>
-          </ul>
+      </div>
-        </li>
-        <li class="">
-          <a href="./javascript.html">Javascript</a>
-          <ul>
-            <li><a href="./javascript.html#javascript">All plugins</a></li>
-            <li><a href="./javascript.html#modals">Modal</a></li>
-            <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-            <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-            <li><a href="./javascript.html#tabs">Tab</a></li>
-            <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-            <li><a href="./javascript.html#popovers">Popover</a></li>
-            <li><a href="./javascript.html#alerts">Alert</a></li>
-            <li><a href="./javascript.html#buttons">Button</a></li>
-            <li><a href="./javascript.html#collapse">Collapse</a></li>
-            <li><a href="./javascript.html#carousel">Carousel</a></li>
-            <li><a href="./javascript.html#typeahead">Typeahead</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./less.html">LESS</a>
-          <ul>
-            <li><a href="./less.html#builtWith">Built with Less</a></li>
-            <li><a href="./less.html#variables">Variables</a></li>
-            <li><a href="./less.html#mixins">Mixins</a></li>
-            <li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./download.html">Customize</a>
-        </li>
-        <li class="">
-          <a href="./examples.html">Examples</a>
-        </li>
-      </ul>
    </div>
    <div class="bs-docs-container">
@@ -152,7 +118,7 @@
  <h1>Designed for everyone, everywhere.</h1>
  <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
  <div class="row">
-    <div class="span4">
+    <div class="span5">
      <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
      <h2>Built for and by nerds</h2>
      <p>We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.</p>
@@ -169,7 +135,7 @@
      <h2>Responsive design</h2>
      <p>As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
    </div>
-    <div class="span4">
+    <div class="span5">
      <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
      <h2>Styleguide docs</h2>
      <p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
@@ -193,27 +159,27 @@
  <h1>Built with Bootstrap.</h1>
  <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
  <ul class="thumbnails example-sites">
-    <li class="span2">
+    <li class="span3">
      <a class="thumbnail" href="http://soundready.fm/" target="_blank">
        <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
      </a>
    </li>
-    <li class="span2">
+    <li class="span3">
      <a class="thumbnail" href="http://kippt.com/" target="_blank">
        <img src="assets/img/example-sites/kippt.png" alt="Kippt">
      </a>
    </li>
-    <li class="span2">
+    <li class="span3">
      <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
        <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
      </a>
    </li>
-    <li class="span2">
+<!--     <li class="span2">
      <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
        <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
      </a>
    </li>
-  </ul>
+ -->  </ul>
 </div><!-- /.marketing -->
@@ -227,7 +193,7 @@
        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
      </footer>
-    </div><!-- /container -->
+    </div>

--- a/docs/javascript.html
+++ b/docs/javascript.html
--- a/docs/less.html
+++ b/docs/less.html
@@ -27,84 +27,50 @@
  </head>
-  <body>
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
-    <div class="bs-docs-nav">
+    <!-- Navbar
-      <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
+    ================================================== -->
-      <ul class="bs-nav">
+    <div class="navbar navbar-fixed-top">
-        <li class="">
+      <div class="navbar-inner">
-          <a href="./scaffolding.html">Scaffolding</a>
+        <div class="bs-docs-container">
-          <ul>
+          <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <li><a href="./scaffolding.html#global">Global styles</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridSystem">Grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridCustomization">Customizing</a></li>
+          </button>
-            <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <a class="brand" href="./index.html">Bootstrap</a>
-            <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+          <div class="nav-collapse collapse">
-          </ul>
+            <ul class="nav">
-        </li>
+              <li class="">
-        <li class="">
+                <a href="./index.html">Home</a>
-          <a href="./base-css.html">Base CSS</a>
+              </li>
-          <ul>
+              <li class="">
-            <li><a href="./base-css.html#typography">Typography</a></li>
+                <a href="./scaffolding.html">Scaffolding</a>
-            <li><a href="./base-css.html#code">Code</a></li>
+              </li>
-            <li><a href="./base-css.html#tables">Tables</a></li>
+              <li class="">
-            <li><a href="./base-css.html#forms">Forms</a></li>
+                <a href="./base-css.html">Base CSS</a>
-            <li><a href="./base-css.html#buttons">Buttons</a></li>
+              </li>
-            <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+              <li class="">
-          </ul>
+                <a href="./components.html">Components</a>
-        </li>
+              </li>
-        <li class="">
+              <li class="">
-          <a href="./components.html">Components</a>
+                <a href="./javascript.html">Javascript</a>
-          <ul>
+              </li>
-            <li><a href="./components.html#buttonGroups">Button groups</a></li>
+              <li class="active">
-            <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+                <a href="./less.html">LESS</a>
-            <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+              </li>
-            <li><a href="./components.html#navbar">Navbar</a></li>
+              <li class="divider-vertical"></li>
-            <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+              <li class="">
-            <li><a href="./components.html#pagination">Pagination</a></li>
+                <a href="./download.html">Customize</a>
-            <li><a href="./components.html#labels">Labels</a></li>
+              </li>
-            <li><a href="./components.html#badges">Badges</a></li>
+              <li class="">
-            <li><a href="./components.html#typography">Typography</a></li>
+                <a href="./examples.html">Examples</a>
-            <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+              </li>
-            <li><a href="./components.html#alerts">Alerts</a></li>
+            </ul>
-            <li><a href="./components.html#progress">Progress bars</a></li>
+          </div>
-            <li><a href="./components.html#misc">Miscellaneous</a></li>
+        </div>
-          </ul>
+      </div>
-        </li>
-        <li class="">
-          <a href="./javascript.html">Javascript</a>
-          <ul>
-            <li><a href="./javascript.html#javascript">All plugins</a></li>
-            <li><a href="./javascript.html#modals">Modal</a></li>
-            <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-            <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-            <li><a href="./javascript.html#tabs">Tab</a></li>
-            <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-            <li><a href="./javascript.html#popovers">Popover</a></li>
-            <li><a href="./javascript.html#alerts">Alert</a></li>
-            <li><a href="./javascript.html#buttons">Button</a></li>
-            <li><a href="./javascript.html#collapse">Collapse</a></li>
-            <li><a href="./javascript.html#carousel">Carousel</a></li>
-            <li><a href="./javascript.html#typeahead">Typeahead</a></li>
-          </ul>
-        </li>
-        <li class="active">
-          <a href="./less.html">LESS</a>
-          <ul>
-            <li><a href="./less.html#builtWith">Built with Less</a></li>
-            <li><a href="./less.html#variables">Variables</a></li>
-            <li><a href="./less.html#mixins">Mixins</a></li>
-            <li><a href="./less.html#compiling">Compiling Bootstrap</a></li>
-          </ul>
-        </li>
-        <li class="">
-          <a href="./download.html">Customize</a>
-        </li>
-        <li class="">
-          <a href="./examples.html">Examples</a>
-        </li>
-      </ul>
    </div>
    <div class="bs-docs-container">
@@ -114,21 +80,15 @@
 <header class="jumbotron subhead" id="overview">
  <h1>Using LESS with Bootstrap</h1>
  <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
-</header>
+  <div class="subnav">
+    <ul class="nav nav-pills">
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>Contents</h3>
-    <ol>
      <li><a href="#builtWith">Built with Less</a></li>
      <li><a href="#variables">Variables</a></li>
      <li><a href="#mixins">Mixins</a></li>
      <li><a href="#compiling">Compiling Bootstrap</a></li>
-    </ol>
+    </ul>
  </div>
-</section>
+</header>
@@ -1053,7 +1013,7 @@
        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
      </footer>
-    </div><!-- /container -->
+    </div>

--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -39,84 +39,50 @@
    {{/production}}
  </head>
-  <body>
+  <body data-spy="scroll" data-target=".subnav" data-offset="50">
-    <div class="bs-docs-nav">
+    <!-- Navbar
-      <h3 class="bs-docs-logo"><a href="./index.html">{{_i}}Bootstrap{{/i}}</a></h3>
+    ================================================== -->
-      <ul class="bs-nav">
+    <div class="navbar navbar-fixed-top">
-        <li class="{{scaffolding}}">
+      <div class="navbar-inner">
-          <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
+        <div class="bs-docs-container">
-          <ul>
+          <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <li><a href="./scaffolding.html#global">{{_i}}Global styles{{/i}}</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridSystem">{{_i}}Grid system{{/i}}</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
+            <span class="icon-bar"></span>
-            <li><a href="./scaffolding.html#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
+          </button>
-            <li><a href="./scaffolding.html#layouts">{{_i}}Layouts{{/i}}</a></li>
+          <a class="brand" href="./index.html">Bootstrap</a>
-            <li><a href="./scaffolding.html#responsive">{{_i}}Responsive design{{/i}}</a></li>
+          <div class="nav-collapse collapse">
-          </ul>
+            <ul class="nav">
-        </li>
+              <li class="{{index}}">
-        <li class="{{base-css}}">
+                <a href="./index.html">{{_i}}Home{{/i}}</a>
-          <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
+              </li>
-          <ul>
+              <li class="{{scaffolding}}">
-            <li><a href="./base-css.html#typography">{{_i}}Typography{{/i}}</a></li>
+                <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
-            <li><a href="./base-css.html#code">{{_i}}Code{{/i}}</a></li>
+              </li>
-            <li><a href="./base-css.html#tables">{{_i}}Tables{{/i}}</a></li>
+              <li class="{{base-css}}">
-            <li><a href="./base-css.html#forms">{{_i}}Forms{{/i}}</a></li>
+                <a href="./base-css.html">{{_i}}Base CSS{{/i}}</a>
-            <li><a href="./base-css.html#buttons">{{_i}}Buttons{{/i}}</a></li>
+              </li>
-            <li><a href="./base-css.html#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
+              <li class="{{components}}">
-          </ul>
+                <a href="./components.html">{{_i}}Components{{/i}}</a>
-        </li>
+              </li>
-        <li class="{{components}}">
+              <li class="{{javascript}}">
-          <a href="./components.html">{{_i}}Components{{/i}}</a>
+                <a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
-          <ul>
+              </li>
-            <li><a href="./components.html#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
+              <li class="{{less}}">
-            <li><a href="./components.html#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
+                <a href="./less.html">{{_i}}LESS{{/i}}</a>
-            <li><a href="./components.html#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
+              </li>
-            <li><a href="./components.html#navbar">{{_i}}Navbar{{/i}}</a></li>
+              <li class="divider-vertical"></li>
-            <li><a href="./components.html#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
+              <li class="{{download}}">
-            <li><a href="./components.html#pagination">{{_i}}Pagination{{/i}}</a></li>
+                <a href="./download.html">{{_i}}Customize{{/i}}</a>
-            <li><a href="./components.html#labels">{{_i}}Labels{{/i}}</a></li>
+              </li>
-            <li><a href="./components.html#badges">{{_i}}Badges{{/i}}</a></li>
+              <li class="{{examples}}">
-            <li><a href="./components.html#typography">{{_i}}Typography{{/i}}</a></li>
+                <a href="./examples.html">{{_i}}Examples{{/i}}</a>
-            <li><a href="./components.html#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
+              </li>
-            <li><a href="./components.html#alerts">{{_i}}Alerts{{/i}}</a></li>
+            </ul>
-            <li><a href="./components.html#progress">{{_i}}Progress bars{{/i}}</a></li>
+          </div>
-            <li><a href="./components.html#misc">{{_i}}Miscellaneous{{/i}}</a></li>
+        </div>
-          </ul>
+      </div>
-        </li>
-        <li class="{{javascript}}">
-          <a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
-          <ul>
-            <li><a href="./javascript.html#javascript">{{_i}}All plugins{{/i}}</a></li>
-            <li><a href="./javascript.html#modals">{{_i}}Modal{{/i}}</a></li>
-            <li><a href="./javascript.html#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
-            <li><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
-            <li><a href="./javascript.html#tabs">{{_i}}Tab{{/i}}</a></li>
-            <li><a href="./javascript.html#tooltips">{{_i}}Tooltip{{/i}}</a></li>
-            <li><a href="./javascript.html#popovers">{{_i}}Popover{{/i}}</a></li>
-            <li><a href="./javascript.html#alerts">{{_i}}Alert{{/i}}</a></li>
-            <li><a href="./javascript.html#buttons">{{_i}}Button{{/i}}</a></li>
-            <li><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></li>
-            <li><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></li>
-            <li><a href="./javascript.html#typeahead">{{_i}}Typeahead{{/i}}</a></li>
-          </ul>
-        </li>
-        <li class="{{less}}">
-          <a href="./less.html">{{_i}}LESS{{/i}}</a>
-          <ul>
-            <li><a href="./less.html#builtWith">{{_i}}Built with Less{{/i}}</a></li>
-            <li><a href="./less.html#variables">{{_i}}Variables{{/i}}</a></li>
-            <li><a href="./less.html#mixins">{{_i}}Mixins{{/i}}</a></li>
-            <li><a href="./less.html#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
-          </ul>
-        </li>
-        <li class="{{download}}">
-          <a href="./download.html">{{_i}}Customize{{/i}}</a>
-        </li>
-        <li class="{{examples}}">
-          <a href="./examples.html">{{_i}}Examples{{/i}}</a>
-        </li>
-      </ul>
    </div>
    <div class="bs-docs-container">
@@ -133,7 +99,7 @@
        <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
      </footer>
-    </div><!-- /container -->
+    </div>{{! /container }}

--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -11,9 +11,6 @@
  .border-radius(4px);
  color: @warningText;
 }
-.alert-heading {
-  color: inherit;
-}
 // Adjust close link position
 .alert .close {
@@ -28,7 +25,7 @@
 .alert-success {
  background-color: @successBackground;
-  border-color: @successBorder;  
+  border-color: @successBorder;
  color: @successText;
 }
 .alert-danger,