tons of docs cleanup in css, adding subnav to official components

17 files changed, 190 insertions, 235 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 2ecc9690e1..ca0cb81d66 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -116,7 +116,7 @@
     padding-left: 10px;
   }
   .modal {
-    position: absolute;
+    position: fixed;
     top: 10px;
     right: 10px;
     left: 10px;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 404c5eb502..fcbae2b319 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3985,13 +3985,12 @@ input[type="submit"].btn.btn-mini {
 }
 
 .navbar .nav > li {
-  display: block;
   float: left;
 }
 
 .navbar .nav > li > a {
   float: none;
-  padding: 9px 10px 11px;
+  padding: 9px 12px 11px;
   line-height: 19px;
   color: #999999;
   text-decoration: none;
@@ -4045,18 +4044,18 @@ input[type="submit"].btn.btn-mini {
   padding: 7px 10px;
   margin-right: 5px;
   margin-left: 5px;
-  background-color: #2c2c2c;
-  *background-color: #222222;
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-color: #1f1f1f;
+  *background-color: #151515;
+  background-image: -ms-linear-gradient(top, #262626, #151515);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#262626), to(#151515));
+  background-image: -webkit-linear-gradient(top, #262626, #151515);
+  background-image: -o-linear-gradient(top, #262626, #151515);
+  background-image: linear-gradient(top, #262626, #151515);
+  background-image: -moz-linear-gradient(top, #262626, #151515);
   background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
+  border-color: #151515 #151515 #000000;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff222222', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff262626', endColorstr='#ff151515', GradientType=0);
   filter: progid:dximagetransform.microsoft.gradient(enabled=false);
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
      -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -4068,13 +4067,13 @@ input[type="submit"].btn.btn-mini {
 .navbar .btn-navbar.active,
 .navbar .btn-navbar.disabled,
 .navbar .btn-navbar[disabled] {
-  background-color: #222222;
-  *background-color: #151515;
+  background-color: #151515;
+  *background-color: #080808;
 }
 
 .navbar .btn-navbar:active,
 .navbar .btn-navbar.active {
-  background-color: #080808 \9;
+  background-color: #000000 \9;
 }
 
 .navbar .btn-navbar .icon-bar {
@@ -4172,6 +4171,118 @@ input[type="submit"].btn.btn-mini {
   left: auto;
 }
 
+/* Subnav
+-------------------------------------------------- */
+
+/* Base
+------------------------- */
+
+.subnav {
+  width: 100%;
+  height: 36px;
+  background-color: #f2f2f2;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
+  background-image: linear-gradient(top, #f5f5f5, #eeeeee);
+  background-repeat: repeat-x;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0);
+}
+
+/* Nav links
+------------------------- */
+
+.subnav .nav {
+  margin-bottom: 0;
+}
+
+.subnav .nav > li {
+  float: left;
+}
+
+.subnav .nav > li > a {
+  padding: 8px 12px;
+  line-height: 20px;
+  border-right: 1px solid #e5e5e5;
+  border-left: 1px solid #f5f5f5;
+}
+
+.subnav .nav > .active > a,
+.subnav .nav > .active > a:hover {
+  padding-left: 13px;
+  color: #777;
+  background-color: #e9e9e9;
+  border-left: 0;
+  border-right-color: #ddd;
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
+}
+
+.subnav .nav > .active > a .caret,
+.subnav .nav > .active > a:hover .caret {
+  border-top-color: #777;
+}
+
+.subnav .nav > li:first-child > a,
+.subnav .nav > li:first-child > a:hover {
+  padding-left: 12px;
+  border-left: 0;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.subnav .nav > li:last-child > a {
+  border-right: 0;
+}
+
+/* Dropdown menus get matching border-radius
+.subnav .dropdown-menu {
+  -webkit-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
+     -moz-border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
+          border-radius: 0 0 @subnavBorderRadius @subnavBorderRadius;
+}
+
+
+/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
+
+@media (min-width: 980px) {
+  .subnav-fixed {
+    position: fixed;
+    top: 40px;
+    right: 0;
+    left: 0;
+    z-index: 1020;
+    border-color: #d5d5d5;
+    border-width: 0 0 1px;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+    -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
+       -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
+            box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
+  }
+  .subnav-fixed .nav {
+    max-width: 780px;
+    padding: 0 1px;
+    margin: 0 auto;
+  }
+  .subnav .nav > li:first-child > a,
+  .subnav .nav > li:first-child > a:hover {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+  }
+}
+
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 18px;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 458fa234ec..9e6964a84d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -69,24 +69,14 @@ body > .navbar-fixed-top .brand:hover {
 }
 
 
-/* Space out sub-sections more
+/* Sections
 -------------------------------------------------- */
 
+/* padding for in-page bookmarks and fixed navbar */
 section {
   padding-top: 60px;
 }
 
-section > .table {
-  font-size: 13px;
-}
-
-
-/* Table of contents */
-.bs-docs-contents li {
-  line-height: 25px;
-  color: #777;
-}
-
 /* Separators (hr) */
 .bs-docs-separator {
   margin: 40px 0 39px;
@@ -121,8 +111,10 @@ hr.soften {
   line-height: 1;
 }
 .jumbotron p {
-  margin-bottom: 20px;
+  font-size: 24px;
   font-weight: 300;
+  line-height: 30px;
+  margin-bottom: 30px;
 }
 .jumbotron .btn-large {
   font-size: 18px;
@@ -143,17 +135,21 @@ hr.soften {
   margin-top: 20px;
   margin-bottom: 80px;
 }
-.masthead h1,
-.masthead p {
-}
-.masthead h1 {
-  margin-bottom: 10px;
-}
 .masthead p {
+  margin-bottom: 20px;
   font-size: 30px;
   line-height: 40px;
 }
 
+/* Subhead (other pages)
+------------------------- */
+.subhead {
+  text-align: left;
+}
+.subhead h1 {
+  font-size: 60px;
+}
+
 /* Quick links
 ------------------------- */
 .bs-links {
@@ -183,127 +179,13 @@ hr.soften {
 }
 
 
-
-/* Specific jumbotrons
-------------------------- */
-/* 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 */
-.subnav {
-  width: 100%;
-  height: 36px;
-  background-color: #eeeeee; /* Old browsers */
-  background-repeat: repeat-x; /* Repeat the gradient */
-  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
-  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
-  background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
-  background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-.subnav .nav {
-  margin-bottom: 0;
-}
-.subnav .nav > li > a {
-  margin: 0;
-  padding-top:    11px;
-  padding-bottom: 11px;
-  border-left: 1px solid #f5f5f5;
-  border-right: 1px solid #e5e5e5;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-.subnav .nav > .active > a,
-.subnav .nav > .active > a:hover {
-  padding-left: 13px;
-  color: #777;
-  background-color: #e9e9e9;
-  border-right-color: #ddd;
-  border-left: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-          box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-}
-.subnav .nav > .active > a .caret,
-.subnav .nav > .active > a:hover .caret {
-  border-top-color: #777;
-}
-.subnav .nav > li:first-child > a,
-.subnav .nav > li:first-child > a:hover {
-  border-left: 0;
-  padding-left: 12px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-.subnav .nav > li:last-child > a {
-  border-right: 0;
-}
-.subnav .dropdown-menu {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
-@media (min-width: 980px) {
-  .subnav-fixed {
-    position: fixed;
-    top: 40px;
-    left: 0;
-    right: 0;
-    z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
-    border-color: #d5d5d5;
-    border-width: 0 0 1px; /* drop the border on the fixed edges */
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-       -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-            box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
-  }
-  .subnav-fixed .nav {
-    max-width: 780px;
-    margin: 0 auto;
-    padding: 0 1px;
-  }
-  .subnav .nav > li:first-child > a,
-  .subnav .nav > li:first-child > a:hover {
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-  }
-}
-
-
-
-
 /* Marketing section of Overview
 -------------------------------------------------- */
 .marketing .row {
   margin-bottom: 9px;
 }
 .marketing h1 {
-  margin: 36px 0 27px;
+  margin: 40px 0 10px;
   font-size: 40px;
   font-weight: 300;
   text-align: center;
@@ -312,11 +194,8 @@ hr.soften {
 .marketing h3 {
   font-weight: 300;
 }
-.marketing h2 {
-  font-size: 22px;
-}
 .marketing p {
-  margin-right: 10px;
+  margin: 5px 10px 15px 0;
 }
 .marketing .bs-icon {
   float: left;
@@ -327,11 +206,11 @@ hr.soften {
   float: left;
   margin: 4px 5px 0 0;
 }
-.marketing-byline {
-  margin: -18px 0 27px;
-  font-size: 18px;
+.marketing .marketing-byline {
+  margin-bottom: 30px;
+  font-size: 20px;
   font-weight: 300;
-  line-height: 24px;
+  line-height: 25px;
   color: #999;
   text-align: center;
 }
@@ -340,15 +219,13 @@ hr.soften {
 /* Footer
 -------------------------------------------------- */
 .footer {
-  padding: 35px 0 36px;
-  margin-top: 45px;
+  padding: 40px 0;
+  margin-top: 49px;
   border-top: 1px solid #e5e5e5;
 }
 .footer p {
-  font-size: 12px;
-  line-height: 20px;
   margin-bottom: 0;
-  color: #555;
+  color: #777;
 }
 
 
@@ -800,35 +677,15 @@ form.bs-docs-example {
   }
 
   /* Change up some type stuff */
-  h2 {
-    margin-top: 27px;
-  }
   h2 small {
     display: block;
-    line-height: 18px;
-  }
-  h3 {
-    margin-top: 18px;
   }
 
-  /* icons */
-  .marketing .bs-icon {
-    margin: 0;
-  }
-
-  /* Adjust the jumbotron */
-  .jumbotron h1,
-  .jumbotron p {
-    text-align: center;
-    margin-right: 0;
-  }
+  /* Downsize the jumbotrons */
   .jumbotron h1 {
     font-size: 45px;
-    margin-right: 0;
   }
   .jumbotron p {
-    margin-right: 0;
-    margin-left: 0;
     font-size: 18px;
     line-height: 24px;
   }
@@ -838,18 +695,10 @@ form.bs-docs-example {
     padding: 10px 14px;
     margin: 0 auto 10px;
   }
-  /* Masthead (home page jumbotron) */
-  .masthead {
-    padding-top: 0;
-  }
-
-  /* Don't space out quick links so much */
-  .quick-links {
-    margin: 40px 0 0;
-  }
-  /* hide the bullets on mobile since our horizontal space is limited */
-  .quick-links .divider {
-    display: none;
+  /* center align subhead text like the masthead */
+  .subhead h1,
+  .subhead p {
+    text-align: center;
   }
 
   /* center example sites */
@@ -867,6 +716,7 @@ form.bs-docs-example {
     max-width: 270px;
   }
 
+  /* Do our best to make tables work in narrow viewports */
   table code {
     white-space: normal;
     word-wrap: break-word;
@@ -882,6 +732,11 @@ form.bs-docs-example {
     left: auto;
   }
 
+  /* Unfloat the back to top in footer to prevent odd text wrapping */
+  .footer .pull-right {
+    float: none;
+  }
+
 }
 
 
@@ -895,7 +750,7 @@ form.bs-docs-example {
   /* Jumbotron buttons */
   .jumbotron .btn {
     margin-bottom: 10px;
-av  }
+  }
 
   /* Subnav */
   .subnav {
@@ -948,14 +803,6 @@ av  }
 
 @media (min-width: 480px) and (max-width: 768px) {
 
-  /* Scale down the jumbotron content */
-  .jumbotron h1 {
-    font-size: 54px;
-  }
-  .jumbotron p {
-    margin-right: 0;
-    margin-left: 0;
-  }
 
 }
 
@@ -967,18 +814,13 @@ av  }
     padding-top: 0;
   }
 
-  /* Scale down the jumbotron content */
-  .jumbotron h1 {
-    font-size: 72px;
-  }
-
 }
 
 
 @media (max-width: 980px) {
 
   /* Unfloat brand */
-  .navbar-fixed-top .brand {
+  body > .navbar-fixed-top .brand {
     float: left;
     margin-left: 0;
     padding-left: 10px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 4b9e6d1ede..df2407f8b6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -81,7 +81,7 @@
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#typography">Typography</a></li>
       <li><a href="#code">Code</a></li>
       <li><a href="#tables">Tables</a></li>
diff --git a/docs/components.html b/docs/components.html
index 2207103f51..413a867b11 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -81,7 +81,7 @@
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#dropdowns">Dropdowns</a></li>
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
diff --git a/docs/download.html b/docs/download.html
index 1193e85a3f..db76ef796a 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -81,7 +81,7 @@
   <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">
+    <ul class="nav">
       <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>
diff --git a/docs/index.html b/docs/index.html
index 34bb0fe166..1dea842ffe 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -112,7 +112,7 @@
   </div>
 </header>
 
-<hr class="bs-docs-separator">
+<hr class="soften">
 
 <div class="marketing">
   <h1>Designed for everyone, everywhere.</h1>
@@ -154,7 +154,7 @@
     </div>
   </div><!--/row-->
 
-  <hr class="bs-docs-separator">
+  <hr class="soften">
 
   <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>
diff --git a/docs/javascript.html b/docs/javascript.html
index db6f8218aa..7ad28533a1 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -81,7 +81,8 @@
   <h1>Javascript for Bootstrap</h1>
   <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
+      <li><a href="#transitions">Transitions</a></li>
       <li><a href="#modals">Modal</a></li>
       <li><a href="#dropdowns">Dropdown</a></li>
       <li><a href="#scrollspy">Scrollspy</a></li>
@@ -124,7 +125,7 @@
 
 <!-- Transitions
 ================================================== -->
-<section id="modals">
+<section id="transitions">
   <div class="page-header">
     <h1>Transitions <small>bootstrap-transition.js</small></h1>
   </div>
@@ -190,7 +191,7 @@
   <h3>Live demo</h3>
   <p>Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.</p>
   <!-- sample modal content -->
-  <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div id="myModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal">&times;</button>
       <h3 id="myModalLabel">Modal Heading</h3>
diff --git a/docs/less.html b/docs/less.html
index 68f3a83b76..c2d8963a07 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -81,7 +81,7 @@
   <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>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#builtWith">Built with Less</a></li>
       <li><a href="#variables">Variables</a></li>
       <li><a href="#mixins">Mixins</a></li>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 459933a7e2..c957a90da8 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -81,7 +81,7 @@
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#global">Global styles</a></li>
       <li><a href="#gridSystem">Grid system</a></li>
       <li><a href="#fluidGridSystem">Fluid grid system</a></li>
@@ -473,12 +473,12 @@
     </thead>
     <tbody>
       <tr>
-        <td>Smartphones</td>
+        <td>Phones</td>
         <td>480px and below</td>
         <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
       </tr>
       <tr>
-        <td>Smartphones to tablets</td>
+        <td>Phones to tablets</td>
         <td>767px and below</td>
         <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
       </tr>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9a122711a2..40bbbfba55 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Base CSS{{/i}}</h1>
   <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
       <li><a href="#code">{{_i}}Code{{/i}}</a></li>
       <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 16c910bbd2..579fd08a68 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Components{{/i}}</h1>
   <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li>
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 11280434a2..3d5d70c1ca 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Customize and download{{/i}}</h1>
   <p class="lead">{{_i}}<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.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
       <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
       <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index d7c9713724..9f5e40acea 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -35,7 +35,7 @@
   </div>
 </header>
 
-<hr class="bs-docs-separator">
+<hr class="soften">
 
 <div class="marketing">
   <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
@@ -77,7 +77,7 @@
     </div>
   </div><!--/row-->
 
-  <hr class="bs-docs-separator">
+  <hr class="soften">
 
   <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
   <p class="marketing-byline">{{_i}}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>.{{/i}}</p>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3e558c4f75..52ed45a499 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -4,7 +4,8 @@
   <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
+      <li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li>
       <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
       <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
       <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
@@ -48,7 +49,7 @@
 
 <!-- Transitions
 ================================================== -->
-<section id="modals">
+<section id="transitions">
   <div class="page-header">
     <h1>{{_i}}Transitions{{/i}} <small>bootstrap-transition.js</small></h1>
   </div>
@@ -115,7 +116,7 @@
   <h3>{{_i}}Live demo{{/i}}</h3>
   <p>{{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}</p>
   <!-- sample modal content -->
-  <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div id="myModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal">&times;</button>
       <h3 id="myModalLabel">{{_i}}Modal Heading{{/i}}</h3>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ccd829963c..578a037f64 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}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.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
       <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
       <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index ec0bde55ed..dd96cec37a 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Scaffolding{{/i}}</h1>
   <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
       <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
       <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
@@ -399,12 +399,12 @@
     </thead>
     <tbody>
       <tr>
-        <td>{{_i}}Smartphones{{/i}}</td>
+        <td>{{_i}}Phones{{/i}}</td>
         <td>480px and below</td>
         <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
       </tr>
       <tr>
-        <td>{{_i}}Smartphones to tablets{{/i}}</td>
+        <td>{{_i}}Phones to tablets{{/i}}</td>
         <td>767px and below</td>
         <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
       </tr>