Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

402c4800 · Jacob Thornton · fbb42ccb · b6d50c89 · 402c4800 · 402c4800
Commit 402c4800 authored Jan 07, 2012 by Jacob Thornton
27 changed files
--- a/bootstrap.css
+++ b/bootstrap.css
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -192,6 +192,75 @@ body > .navbar-fixed .brand:hover {
 }
+/* Quickstart section for getting le code
+-------------------------------------------------- */
+.getting-started {
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
+  background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
+  background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
+  background-image: linear-gradient(#f9f9f9, #f5f5f5);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.getting-started {
+  border-color: #eee;
+}
+.getting-started td {
+  width: 33%;
+  border-right: 1px solid #eee;
+}
+.getting-started td + td {
+  border-left: 1px solid #fff;
+}
+.getting-started td:last-child {
+  border-right: 0;
+}
+.quick-start {
+  padding: 17px 20px;
+}
+.quick-start h3,
+.quick-start p {
+  line-height: 18px;
+  text-align: center;
+  margin-bottom: 9px;
+}
+.quick-start p {
+  color: #777;
+}
+.quick-start .current-version,
+.quick-start .current-version a {
+  color: #999;
+}
+.quick-start form {
+  margin-bottom: 0;
+}
+.quick-start textarea {
+  display: block;
+  width: 100%;
+  height: auto;
+  margin-bottom: 0;
+  line-height: 21px;
+  white-space: nowrap;
+  overflow: hidden;
+  /* Makes inputs behave like true block-level elements */
+  -webkit-box-sizing: border-box; /* Older Webkit */
+     -moz-box-sizing: border-box; /* Older FF */
+      -ms-box-sizing: border-box; /* IE8 */
+          box-sizing: border-box; /* CSS3 spec*/
+  /* Hacks for IE7 to make this work just okay enough to function */
+  *width: 90%;
+  *height: 24px;
+}
 /* Footer
 -------------------------------------------------- */
 .footer {
@@ -333,7 +402,8 @@ pre.prettyprint {
 }
 /* Make tables spaced out a bit more */
-h2 + table {
+h2 + table,
+h2 + .row {
  margin-top: 5px;
 }
@@ -341,8 +411,10 @@ h2 + table {
 .example-sites img {
  max-width: 290px;
 }
-.built-with {
+.marketing-byline {
  margin: -18px 0 27px;
+  font-size: 18px;
+  font-weight: 300;
  color: #999;
  text-align: center;
 }
@@ -385,7 +457,11 @@ form.well {
  outline: 0;
 }
+/* For input sizes, make them display block */
+.docs-input-sizes input[type=text] {
+  display: block;
+  margin-bottom: 9px;
+}
 /* Icons
 ------------------------- */

--- a/docs/assets/js/google-code-prettify/prettify.css
+++ b/docs/assets/js/google-code-prettify/prettify.css
@@ -2,10 +2,10 @@
 .lit { color: #195f91; }
 .pun, .opn, .clo { color: #93a1a1; }
 .fun { color: #dc322f; }
-.str, .atv { color: #62C462; }
+.str, .atv { color: #D14; }
-.kwd, .linenums .tag { color: #049CD9; }
+.kwd, .linenums .tag { color: #1e347b; }
-.typ, .atn, .dec, .var { color: #EE5F5B; }
+.typ, .atn, .dec, .var { color: teal; }
-.pln { color: #93a1a1; }
+.pln { color: #48484c; }
 pre.prettyprint {
  background-color: #fefbf3;
  padding: 9px;
@@ -17,8 +17,26 @@ pre.prettyprint {
  background-color: #252525;
 }
+pre.prettyprint {
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+}
 /* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
+ol.linenums {
-ol.linenums li { color: #444; line-height: 18px; }
+  margin: 0 0 0 33px; /* IE indents via margin-left */
+} 
+ol.linenums li {
+  padding-left: 12px;
+  color: #bebec5;
+  line-height: 18px;
+  text-shadow: 0 1px 0 #fff;
+}
 /* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 {  }
+li.L1, li.L3, li.L5, li.L7, li.L9 {
\ No newline at end of file
+}
\ No newline at end of file
--- a/docs/base-css.html
+++ b/docs/base-css.html
--- a/docs/components.html
+++ b/docs/components.html
@@ -227,27 +227,27 @@
 ================================================== -->
 <section id="sidenav">
  <div class="page-header">
-    <h1>Side nav <small></small></h1>
+    <h1>Side nav <small>for lists of links</small></h1>
  </div>
  <div class="row">
    <div class="span3">
+      <h3>Examples</h3>
+      <p>Side navs can be just links, links with headings, and links with icons.</p>
      <div class="well side-nav">
-        <h6 class="nav-label">Your account</h6>
        <ul class="nav-group">
          <li class="active"><a class="nav-item" href="#">Home</a></li>
          <li><a class="nav-item" href="#">Library</a></li>
+          <li><a class="nav-item" href="#">Help</a></li>
+        </ul>
+        <h6 class="nav-label">Your account</h6>
+        <ul class="nav-group">
          <li><a class="nav-item" href="#">Profile</a></li>
          <li><a class="nav-item" href="#">Settings</a></li>
-          <li><a class="nav-item" href="#">Help</a></li>
        </ul>
-      </div>
-    </div>
-    <div class="span3">
-      <div class="well side-nav">
        <h6 class="nav-label">Your account</h6>
        <ul class="nav-group">
-          <li class="active"><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
+          <li><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
          <li><a class="nav-item" href="#"><i class="book"></i> Library</a></li>
          <li><a class="nav-item" href="#"><i class="user"></i> Profile</a></li>
          <li><a class="nav-item" href="#"><i class="cog"></i> Settings</a></li>
@@ -255,6 +255,34 @@
        </ul>
      </div>
    </div>
+    <div class="span3">
+      <h3>Why use it</h3>
+      <p></p>
+    </div>
+    <div class="span6">
+      <h3>Markup</h3>
+      <p>Marking up a side nav is at the core just writing an unordered list of links.</p>
+<pre class="prettyprint linenums">
+  &lt;ul class="nav-group"&gt;
+    &lt;li class="active"&gt;
+      &lt;a class="nav-item" href="#"&gt;Home&lt;/a&gt;
+    &lt;/li&gt;
+    &lt;li&gt;&lt;a class="nav-item" href="#"&gt;Library&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a class="nav-item" href="#"&gt;Help&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+</pre>
+      <p>Bootstrap also makes it easy to expand a regular list of links with multiple groups and headings.</p>
+<pre class="prettyprint linenums">
+  &lt;h6 class="nav-label"&gt;&lt;/h6&gt;
+  &lt;ul class="nav-group"&gt;
+    ...
+  &lt;/ul&gt;
+  &lt;h6 class="nav-label"&gt;&lt;/h6&gt;
+  &lt;ul class="nav-group"&gt;
+    ...
+  &lt;/ul&gt;
+</pre>
+    </div>
  </div>
 </section>
@@ -267,10 +295,12 @@
  <div class="page-header">
    <h1>Navbar</h1>
  </div>
-  <div class="navbar navbar-static" >
+  <h2>Static navbar example</h2>
+  <p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
+  <div class="navbar navbar-static">
    <div class="navbar-inner">
      <div class="container" style="width: auto;">
-        <a class="brand" href="#">Project Name</a>
+        <a class="brand" href="#">Project name</a>
        <ul class="nav">
          <li class="active"><a href="#">Home</a></li>
          <li><a href="#">Link</a></li>
@@ -306,20 +336,70 @@
  </div><!-- /navbar -->
  <div class="row">
-    <div class="span4">
+    <div class="span8">
-      <h3>What is it</h3>
+      <h3>Navbar scaffolding</h3>
-      <p>Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.</p>
+      <p>The navbar requires only a few divs to structure it well for static or fixed display.</p>
-    </div>
+<pre class="prettyprint linenums">
-    <div class="span4">
+&lt;div class="navbar navbar-static"&gt;
-      <h3>Customizable</h3>
+  &lt;div class="navbar-inner"&gt;
-      <p>All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav&mdash;or any combination of that.</p>
+    &lt;div class="container" style="width: auto;"&gt;
+      ...
+    &lt;/div&gt;
+  &lt;/div&gt;
+&lt;/div&gt;
+</pre>
+      <p>To make the navbar fixed, swamp the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
+<pre class="prettyprint linenums">
+&lt;div class="navbar navbar-fixed"&gt;
+  ...
+&lt;/div&gt;
+</pre>
+      <br>
+      <h3>Brand name</h3>
+      <p>A simple link to show your brand or project name only requires an anchor tag.</p>
+<pre class="prettyprint linenums">
+&lt;a class="brand" href="#"&gt;
+  Project name
+&lt;/a&gt;
+</pre>
+      <br>
+      <h3>Search form</h3>
+      <p>Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.</p>
+<pre class="prettyprint linenums">
+&lt;form class="navbar-search"&gt;
+  &lt;input type="text" class="search-query pull-left" placeholder="Search"&gt;
+&lt;/form&gt;
+</pre>
    </div>
    <div class="span4">
-      <h3>Dropdowns included</h3>
+      <h3>Nav links</h3>
-      <p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <code>&lt;li&gt;</code> tags also support <code>.active</code> for showing current page selection.</p>
+      <p>Nav items are simple to add via unordered lists.</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav"&gt;
+  &lt;li class="active"&gt;
+    &lt;a href="#">Home&lt;/a&gt;
+  &lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+</pre>
+      <p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdowns">our javascript plugin</a>.</p>
+<pre class="prettyprint linenums">
+&lt;ul class="nav"&gt;
+  &lt;li class="dropdown"&gt;
+    &lt;a href="#"
+          class="dropdown-toggle"
+          data-toggle="dropdown">
+          Account
+    &lt;/a&gt;
+    &lt;ul class="dropdown-menu"&gt;
+      ...
+    &lt;/ul&gt;
+  &lt;/li&gt;
+&lt;/ul&gt;
+</pre>
    </div>
  </div>
-  <p><strong>Note:</strong> When using the navbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
 </section>
@@ -507,34 +587,39 @@
  </div>
  <div class="row">
-    <div class="span3">
+    <div class="span6">
-      <p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.</p>
+      <h3>Why use them</h3>
-    </div>
+      <p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.</p>
-    <div class="span9">
+      <h3>Examples</h3>
+      <p>A single example shown as it might be displayed across multiple pages.</p>
      <ul class="breadcrumb">
        <li class="active">Home</li>
      </ul>
      <ul class="breadcrumb">
        <li><a href="#">Home</a> <span class="divider">/</span></li>
-        <li class="active">Middle page</li>
+        <li class="active">Library</li>
-      </ul>
-      <ul class="breadcrumb">
-        <li><a href="#">Home</a> <span class="divider">/</span></li>
-        <li><a href="#">Middle page</a> <span class="divider">/</span></li>
-        <li class="active">Another one</li>
      </ul>
      <ul class="breadcrumb">
        <li><a href="#">Home</a> <span class="divider">/</span></li>
-        <li><a href="#">Middle page</a> <span class="divider">/</span></li>
+        <li><a href="#">Library</a> <span class="divider">/</span></li>
-        <li><a href="#">Another one</a> <span class="divider">/</span></li>
+        <li class="active">Data</li>
-        <li class="active">You are here</li>
      </ul>
+    </div>
+    <div class="span6">
+      <h3>Markup</h3>
+      <p>HTML is your standard unordered list with links.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="breadcrumb"&gt;
-  &lt;li&gt;&lt;a href="#"&gt;Home&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;&lt;/li&gt;
+  &lt;li&gt;
-  &lt;li&gt;&lt;a href="#"&gt;Middle page&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;&lt;/li&gt;
+    &lt;a href="#"&gt;Home&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;
-  &lt;li&gt;&lt;a href="#"&gt;Another one&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;&lt;/li&gt;
+  &lt;/li&gt;
-  &lt;li class="active"&gt;You are here&lt;/li&gt;
+  &lt;li&gt;
+    &lt;a href="#"&gt;Library&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;
+  &lt;/li&gt;
+  &lt;li class="active"&gt;
+    &lt;a href="#"&gt;Data&lt;/a&gt;
+  &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
    </div>
@@ -545,13 +630,14 @@
 <!-- Step nav
-================================================== -->
+==================================================
+COMMENTED OUT AND NOT SUPPORTED AT THIS TIME.
 <section id="stepNav">
  <div class="page-header">
    <h1>Step nav <small></small></h1>
  </div>
-  <!-- Step nav -->
  <div class="row">
    <div class="span3">
      <p>Placeholder for now!</p>
@@ -571,8 +657,8 @@
      <br>
    </div>
  </div>
 </section>
+-->
@@ -682,6 +768,9 @@
 </pre>
    </div>
  </div><!-- /row -->
+  <br>
  <!-- Block messages -->
  <div class="row">
    <div class="span3">

--- a/docs/index.html
+++ b/docs/index.html
@@ -106,8 +106,8 @@
        <div class="marketing">
-          <h1>Built with Bootstrap</h1>
+          <h1>Built with Bootstrap.</h1>
-          <p class="built-with">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
+          <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
          <ul class="thumbnails example-sites">
            <li class="span4">
              <a class="thumbnail" href="http://kippt.com/" target="_blank">
@@ -126,7 +126,7 @@
            </li>
          </ul>
-          <h1>Designed for everyone, everywhere</h1>
+          <h1>Designed for everyone, everywhere.</h1>
          <div class="row">
            <div class="span4">
              <img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
@@ -200,8 +200,40 @@
              <p>Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.</p>
            </div>
          </div><!--/row-->
-        </div>
+          <!-- Quickstart options
+          ================================================== -->
+          <h1>Get started in no time.</h1>
+          <p class="marketing-byline">Built for any skill level, Bootstrap fits your workflow and development process.</p>
+          <table class="bordered-table getting-started">
+            <tbody>
+              <tr>
+                <td class="quick-start">
+                  <h3>Hotlink the CSS</h3>
+                  <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
+                  <form>
+                    <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
+                  </form>
+                </td>
+                <td class="quick-start">
+                  <h3>Use it with LESS</h3>
+                  <p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
+                  <form>
+                    <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
+      &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
+                  </form>
+                </td>
+                <td class="quick-start">
+                  <h3>Fork on GitHub</h3>
+                  <p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
+                  <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
+                  <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div><!-- /.marketing -->
      </div><!-- /#overview -->

--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -235,7 +235,14 @@ $('#myModal').on('hidden', function () {
              <h3>Modal Heading</h3>
            </div>
            <div class="modal-body">
-              <p>One fine body…</p>
+              <h4>Text in a modal</h4>
+              <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
+              <h4>Popover in a modal</h4>
+              <p>This <a href="#" class="btn" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on hover.</p>
+              <h4>Twipsy tooltips in a modal</h4>
+              <p><a href="#" class="twipsy-test" title="Tooltip">This link</a> and <a href="#" class="twipsy-test" title="Tooltip">that link</a> should have Twipsy tooltips on hover.</p>
            </div>
            <div class="modal-footer">
              <a href="#" class="btn primary">Save changes</a>
@@ -274,7 +281,7 @@ $('#myModal').on('hidden', function () {
 &lt;ul class="tabs"&gt;
  &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
  &lt;li id="secondary" class="dropdown"&gt;
-    &lt;a href="#secondary" class="dropdown-toggle" data-toggle="dropdown"&gt;Dropdown&lt;/a&gt;
+    &lt;a href="#secondary" class="dropdown-toggle" data-toggle="dropdown"&gt;Dropdown &lt;span class="caret"&gt;&lt;/span&gt;&lt;/a&gt;
    &lt;ul class="dropdown-menu"&gt;
      &lt;li&gt;&lt;a href="#"&gt;Secondary link&lt;/a&gt;&lt;/li&gt;
      &lt;li&gt;&lt;a href="#"&gt;Something else here&lt;/a&gt;&lt;/li&gt;
@@ -302,7 +309,7 @@ $('#myModal').on('hidden', function () {
                </form>
                <ul class="nav secondary-nav">
                  <li id="fat-menu" class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 1</a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 1 <span class="caret"></span></a>
                    <ul class="dropdown-menu">
                      <li><a href="#">Secondary link</a></li>
                      <li><a href="#">Something else here</a></li>
@@ -311,7 +318,7 @@ $('#myModal').on('hidden', function () {
                    </ul>
                  </li>
                  <li id="mdo-menu" class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2</a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <span class="caret"></span></a>
                    <ul class="dropdown-menu">
                      <li><a href="#">Secondary link</a></li>
                      <li><a href="#">Something else here</a></li>
@@ -1144,6 +1151,7 @@ $('.myCarousel').carousel({
        $('.twipsy-demo.well').twipsy({
          selector: "a[rel=twipsy]"
        })
+        $('.twipsy-test').twipsy()
        // popover demo
        $("a[rel=popover]")

--- a/docs/less.html
+++ b/docs/less.html
@@ -403,8 +403,8 @@
        <tr>
          <td>Node with makefile</td>
          <td>
-            <p>Install the less command line compiler with npm by running the following command:</p>
+            <p>Install the LESS command line compiler with npm by running the following command:</p>
-            <pre>$ npm install lessc</pre>
+            <pre>$ npm install less</pre>
            <p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
            <p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
          </td>
@@ -422,7 +422,7 @@
        <tr>
          <td>Command line</td>
          <td>
-            <p>If you already have the less command line tool installed, simply run the following command:</p>
+            <p>Install the LESS command line tool via Node and run the following command:</p>
              <pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
            <p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
          </td>

--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -395,7 +395,6 @@
            <dd><a href="./components.html#sidenav">Side nav</a></dd>
            <dd><a href="./components.html#navbar">Navbar</a></dd>
            <dd><a href="./components.html#tabspills">Tabs and pills</a></dd>
-            <dd><a href="./components.html#stepnav">Step nav</a></dd>
            <dd><a href="./components.html#pagination">Pagination</a></dd>
            <dd><a href="./components.html#alerts">Alerts and errors</a></dd>
            <dd><a href="./components.html#modals">Modals</a></dd>

--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -92,6 +92,9 @@
  <li>Typography
    <ul>
      <li>Right-aligned option for blockquotes if float: right;</li>
+      <li><code>h4</code> elements were dropped from 16px to 14px with a default <code>line-height</code> of 18px</li>
+      <li><code>h5</code> elements were dropped from 14px to 12px</li>
+      <li><code>h6</code> elements were dropped from 13px to 11px</li>
    </ul>
  </li>
  <li>Buttons
@@ -99,6 +102,17 @@
      <li>Added button bar options</li>
    </ul>
  </li>
+  <li>Examples
+    <ul>
+      <li>Fluid examples redone. <code>.fluid-container</code> now requires a <code>.sidebar-left</code> or <code>.sidebar-right</code> as well. Fluid sidebar element has a new class, <code>.fluid-sidebar</code>.</li>
+    </ul>
+  </li>
+  <li>Dropdown menus
+    <ul>
+      <li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>
+      <li>Now requires you to add a <code>&lt;span class="caret"&gt;&lt;/span&gt;</code> to show the dropdown arrow</li>
+    </ul>
+  </li>
 </ul>
 <!--
  <li>

--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -75,7 +75,7 @@
  <body>
-    <div class="navbar">
+    <div class="navbar navbar-fixed">
      <div class="navbar-inner">
        <div class="container">
          <a class="brand" href="#">Project name</a>

--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -28,7 +28,7 @@
  <body>
-    <div class="navbar">
+    <div class="navbar navbar-fixed">
      <div class="navbar-inner">
        <div class="fluid-container">
          <a class="brand" href="#">Project name</a>
@@ -42,8 +42,8 @@
      </div>
    </div>
-    <div class="fluid-container reverse">
+    <div class="fluid-container sidebar-right">
-      <div class="fluid-sidebar-right">
+      <div class="fluid-sidebar">
        <div class="well">
          <h5>Sidebar</h5>
          <ul>
@@ -78,17 +78,17 @@
        <!-- Example row of columns -->
        <div class="row">
-          <div class="span6">
+          <div class="span4">
            <h2>Heading</h2>
-            <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+           <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="span5">
+          <div class="span4">
            <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="span5">
+          <div class="span4">
            <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>
@@ -99,23 +99,25 @@
        <!-- Example row of columns -->
        <div class="row">
-          <div class="span6">
+          <div class="span4">
            <h2>Heading</h2>
-            <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+           <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="span5">
+          <div class="span4">
            <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="span5">
+          <div class="span4">
            <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>
        </div>
+        <hr>
        <footer>
          <p>&copy; Company 2011</p>
        </footer>

--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -28,7 +28,7 @@
  <body>
-    <div class="navbar">
+    <div class="navbar navbar-fixed">
      <div class="navbar-inner">
        <div class="fluid-container">
          <a class="brand" href="#">Project name</a>
@@ -42,29 +42,29 @@
      </div>
    </div>
-    <div class="fluid-container">
+    <div class="fluid-container sidebar-left">
-      <div class="fluid-sidebar-left">
+      <div class="fluid-sidebar">
-        <div class="well">
+        <div class="well side-nav">
-          <h5>Sidebar</h5>
+          <h5 class="nav-label">Sidebar</h5>
-          <ul>
+          <ul class="nav-group">
-            <li><a href="#">Link</a></li>
+            <li class="active"><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
          </ul>
-          <h5>Sidebar</h5>
+          <h5 class="nav-label">Sidebar</h5>
-          <ul>
+          <ul class="nav-group">
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
          </ul>
-          <h5>Sidebar</h5>
+          <h5 class="nav-label">Sidebar</h5>
-          <ul>
+          <ul class="nav-group">
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a class="nav-item" href="#">Link</a></li>
          </ul>
        </div>
      </div>
@@ -78,9 +78,9 @@
        <!-- Example row of columns -->
        <div class="row">
-          <div class="span6">
+          <div class="span4">
            <h2>Heading</h2>
-            <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+           <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="span5">
@@ -99,9 +99,9 @@
        <!-- Example row of columns -->
        <div class="row">
-          <div class="span6">
+          <div class="span4">
            <h2>Heading</h2>
-            <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+           <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="span5">
@@ -116,6 +116,8 @@
          </div>
        </div>
+        <hr>
        <footer>
          <p>&copy; Company 2011</p>
        </footer>

--- a/examples/hero.html
+++ b/examples/hero.html
@@ -28,7 +28,7 @@
  <body>
-    <div class="navbar">
+    <div class="navbar navbar-fixed">
      <div class="navbar-inner">
        <div class="container">
          <a class="brand" href="#">Project name</a>
@@ -52,17 +52,17 @@
      <!-- Example row of columns -->
      <div class="row">
-        <div class="span6">
+        <div class="span4">
          <h2>Heading</h2>
-          <p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+           <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="span5">
+        <div class="span4">
          <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="span5">
+        <div class="span4">
          <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>

--- a/lib/button-groups.less
+++ b/lib/button-groups.less
 // BUTTON GROUPS
 // -------------
-// Group multiple button groups together for a toolbar
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  .clearfix(); // clears the floated buttons
+}
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+// Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  .clearfix();
  .btn-group {
-    float: left;
+    display: inline-block;
-    margin-right: 10px;
  }
 }
-// Clear the float
-.btn-group {
-  .clearfix();
-}
 // Float them, remove border radius, then re-add to first and last elements
 .btn-group .btn {
  position: relative;
  float: left;
  margin-left: -1px;
  .border-radius(0);
-  // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-  &:first-child {
-    margin-left: 0;
-       -webkit-border-top-left-radius: 4px;
-           -moz-border-radius-topleft: 4px;
-               border-top-left-radius: 4px;
-    -webkit-border-bottom-left-radius: 4px;
-        -moz-border-radius-bottomleft: 4px;
-            border-bottom-left-radius: 4px;
-  }
-  &:last-child {
-       -webkit-border-top-right-radius: 4px;
-           -moz-border-radius-topright: 4px;
-               border-top-right-radius: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-        -moz-border-radius-bottomright: 4px;
-            border-bottom-right-radius: 4px;
-  }
-  // Reset corners for large buttons
-  &.large:first-child {
-    margin-left: 0;
-       -webkit-border-top-left-radius: 6px;
-           -moz-border-radius-topleft: 6px;
-               border-top-left-radius: 6px;
-    -webkit-border-bottom-left-radius: 6px;
-        -moz-border-radius-bottomleft: 6px;
-            border-bottom-left-radius: 6px;
-  }
-  &.large:last-child {
-       -webkit-border-top-right-radius: 6px;
-           -moz-border-radius-topright: 6px;
-               border-top-right-radius: 6px;
-    -webkit-border-bottom-right-radius: 6px;
-        -moz-border-radius-bottomright: 6px;
-            border-bottom-right-radius: 6px;
-  }
 }
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group .btn:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 4px;
+         -moz-border-radius-topleft: 4px;
+             border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+      -moz-border-radius-bottomleft: 4px;
+          border-bottom-left-radius: 4px;
+}
+.btn-group .btn:last-child,
+.btn-group .dropdown-toggle {
+     -webkit-border-top-right-radius: 4px;
+         -moz-border-radius-topright: 4px;
+             border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+      -moz-border-radius-bottomright: 4px;
+          border-bottom-right-radius: 4px;
+}
+// Reset corners for large buttons
+.btn-group .btn.large:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 6px;
+         -moz-border-radius-topleft: 6px;
+             border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+      -moz-border-radius-bottomleft: 6px;
+          border-bottom-left-radius: 6px;
+}
+.btn-group .btn.large:last-child,
+.btn-group .large.dropdown-toggle {
+     -webkit-border-top-right-radius: 6px;
+         -moz-border-radius-topright: 6px;
+             border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+      -moz-border-radius-bottomright: 6px;
+          border-bottom-right-radius: 6px;
+}
 // On hover/focus/active, bring the proper btn to front
 .btn-group .btn:hover,
 .btn-group .btn:focus,
 .btn-group .btn:active {
  z-index: 2;
 }
+// Split button dropdowns
+// ----------------------
+// Give the line between buttons some depth
+.btn-group .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  @shadow: inset 1px 0 0 rgba(255,255,255,.125), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+}
+// Reposition menu on open and round all corners
+.btn-group.open .dropdown-menu {
+  display: block;
+  top: 30px;
+  .border-radius(5px);
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+}
+// Reposition the caret
+.btn .caret {
+  margin-top: 6px;
+  margin-left: 0;
+}
+// Account for other colors
+.primary,
+.danger,
+.info,
+.success {
+  .caret {
+    border-top-color: #fff;
+    .opacity(75);
+  }
+}
--- a/lib/dropdowns.less
+++ b/lib/dropdowns.less
@@ -3,79 +3,75 @@
 .dropdown {
  position: relative;
 }
-// The link that is clicked to toggle the dropdown
+// Dropdown arrow/caret
-.dropdown-toggle:after {
+.caret {
  display: inline-block;
  width: 0;
  height: 0;
-  margin-top: 8px;
-  margin-left: 6px;
  text-indent: -99999px;
  vertical-align: top;
-  border-left: 4px solid transparent;
+  border-left:  4px solid transparent;
  border-right: 4px solid transparent;
-  border-top: 4px solid @white;
+  border-top:   4px solid #000;
  .opacity(30);
  content: "\2193";
 }
-.dropdown:hover .dropdown-toggle:after {
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+.dropdown:hover .caret {
  .opacity(100);
 }
 // The dropdown menu (ul)
 .dropdown-menu {
  position: absolute;
  top: 40px;
-  z-index: 900;
+  z-index: @zindexDropdown;
  float: left;
-  display: none; // None by default, but block on "open" of the menu
+  display: none; // none by default, but block on "open" of the menu
  min-width: 160px;
  max-width: 220px;
  _width: 160px;
-  padding: 6px 0;
+  padding: 5px 0;
-  margin-left: 0; // override default ul styles
+  margin: 0; // override default ul
-  margin-right: 0;
+  list-style: none;
  background-color: @white;
  border-color: #999;
-  border-color: rgba(0,0,0,.2);
+  border-color: rgba(0,0,0,.1);
  border-style: solid;
-  border-width: 0 1px 1px;
+  border-width: 1px;
-  .border-radius(0 0 6px 6px);
+  .border-radius(0 0 5px 5px);
-  .box-shadow(0 2px 4px rgba(0,0,0,.2));
+  .box-shadow(0 5px 10px rgba(0,0,0,.2));
-  .background-clip(padding-box);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
  zoom: 1; // do we need this?
-  // Unfloat any li's to make them stack
-  li {
-    float: none;
-    display: block;
-    background-color: none;
-  }
  // Dividers (basically an hr) within the dropdown
  .divider {
    height: 1px;
-    margin: 5px 0;
+    margin: 5px 1px;
    overflow: hidden;
-    background-color: #eee;
+    background-color: #e5e5e5;
    border-bottom: 1px solid @white;
  }
-}
-.topbar .dropdown-menu, .dropdown-menu {
  // Links within the dropdown menu
  a {
    display: block;
-    padding: 4px 15px;
+    padding: 2px 15px;
    clear: both;
    font-weight: normal;
    line-height: 18px;
    color: @gray;
-    text-shadow: 0 1px 0 @white;
    // Hover state
    &:hover {
-      color: @grayDark;
+      color: #fff;
      text-decoration: none;
-      #gradient > .vertical(#eeeeee, #dddddd);
+      text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-      @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
+      #gradient > .vertical(@blue, @blueDark);
+      @shadow: inset 0 1px 0 rgba(0,0,0,.075), inset 0 -1px rgba(0,0,0,.075);
      .box-shadow(@shadow);
    }
  }

--- a/lib/forms.less
+++ b/lib/forms.less
@@ -96,8 +96,10 @@ input[type=file] {
 // Chrome on Linux and Mobile Safari need background-color
 select {
-  background-color: @white;
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  padding: 0;
  vertical-align: middle;
+  background-color: @white;
 }
 // Make multiple select elements height not fixed
@@ -137,6 +139,17 @@ textarea {
  padding-top: 6px; // has to be padding because margin collaspes
 }
+// Radios and checkboxes on same line
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px; // space out consecutive inline controls
+}
 // FOCUS STATE
@@ -144,14 +157,14 @@ textarea {
 input,
 textarea {
-  .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.1));
  @transition: border linear .2s, box-shadow linear .2s;
  .transition(@transition);
 }
 input:focus,
 textarea:focus {
  border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+  @shadow: inset 0 1px 1px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
  .box-shadow(@shadow);
  outline: 0;
 }
@@ -176,33 +189,52 @@ select:focus {
 .input-xxlarge    { width: 530px; }
 // Grid style input sizes
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+input[class*="span"],
-.formColumns(@columnSpan: 1) {
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
  float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
  margin-left: 0;
 }
+// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+.inputColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
+}
 input,
 textarea,
-select,
 .uneditable-input {
  // Default columns
-  &.span1     { .formColumns(1); }
+  &.span1     { .inputColumns(1); }
-  &.span2     { .formColumns(2); }
+  &.span2     { .inputColumns(2); }
-  &.span3     { .formColumns(3); }
+  &.span3     { .inputColumns(3); }
-  &.span4     { .formColumns(4); }
+  &.span4     { .inputColumns(4); }
-  &.span5     { .formColumns(5); }
+  &.span5     { .inputColumns(5); }
-  &.span6     { .formColumns(6); }
+  &.span6     { .inputColumns(6); }
-  &.span7     { .formColumns(7); }
+  &.span7     { .inputColumns(7); }
-  &.span8     { .formColumns(8); }
+  &.span8     { .inputColumns(8); }
-  &.span9     { .formColumns(9); }
+  &.span9     { .inputColumns(9); }
-  &.span10    { .formColumns(10); }
+  &.span10    { .inputColumns(10); }
-  &.span11    { .formColumns(11); }
+  &.span11    { .inputColumns(11); }
-  &.span12    { .formColumns(12); }
+  &.span12    { .inputColumns(12); }
-  &.span13    { .formColumns(13); }
+}
-  &.span14    { .formColumns(14); }
-  &.span15    { .formColumns(15); }
+.selectColumns(@columnSpan: 1) {
-  &.span16    { .formColumns(16); }
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
+}
+select {
+  &.span1     { .selectColumns(1); }
+  &.span2     { .selectColumns(2); }
+  &.span3     { .selectColumns(3); }
+  &.span4     { .selectColumns(4); }
+  &.span5     { .selectColumns(5); }
+  &.span6     { .selectColumns(6); }
+  &.span7     { .selectColumns(7); }
+  &.span8     { .selectColumns(8); }
+  &.span9     { .selectColumns(9); }
+  &.span10    { .selectColumns(10); }
+  &.span11    { .selectColumns(11); }
+  &.span12    { .selectColumns(12); }
 }
@@ -325,9 +357,13 @@ input::-webkit-input-placeholder {
 .input-append {
  margin-bottom: 5px;
  .clearfix(); // Clear the float to prevent wrapping
-  input {
+  input,
+  .uneditable-input {
    .border-radius(0 3px 3px 0);
  }
+  .uneditable-input {
+    border-left-color: #ccc;
+  }
  .add-on {
    float: left;
    display: block;
@@ -356,10 +392,14 @@ input::-webkit-input-placeholder {
  }
 }
 .input-append {
-  input {
+  input,
+  .uneditable-input {
    float: left;
    .border-radius(3px 0 0 3px);
  }
+  .uneditable-input {
+    border-right-color: #ccc;    
+  }
  .add-on {
    margin-right: 0;
    margin-left: -1px;

--- a/lib/modals.less
+++ b/lib/modals.less
@@ -7,7 +7,7 @@
  right: 0;
  bottom: 0;
  left: 0;
-  z-index: 10000;
+  z-index: @zindexModalBackdrop;
  background-color: @black;
  // Fade for backdrop
  &.fade { opacity: 0; }
@@ -22,7 +22,7 @@
  position: fixed;
  top: 50%;
  left: 50%;
-  z-index: 11000;
+  z-index: @zindexModal;
  max-height: 500px;
  overflow: auto;
  width: 560px;
@@ -34,7 +34,6 @@
  .border-radius(6px);
  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
  .background-clip(padding-box);
-  .close { margin-top: 7px; }
  &.fade {
    .transition(e('opacity .3s linear, top .3s ease-out'));
    top: -25%;
@@ -44,6 +43,8 @@
 .modal-header {
  padding: 5px 15px;
  border-bottom: 1px solid #eee;
+  // Close icon
+  .close { margin-top: 7px; }
 }
 .modal-body {
  padding: 15px;

--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -53,6 +53,16 @@
  }
 }
+// Navbar forms
+.navbar-form {
+  margin-bottom: 0; // remove default bottom margin
+  input,
+  select {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+}
 // Navbar search
 .navbar-search {
  position: relative;
@@ -115,7 +125,7 @@
  top: 0;
  right: 0;
  left: 0;
-  z-index: 10000;
+  z-index: @zindexFixedNavbar;
 }

--- a/lib/popovers.less
+++ b/lib/popovers.less
@@ -5,7 +5,7 @@
  position: absolute;
  top: 0;
  left: 0;
-  z-index: 1000;
+  z-index: @zindexPopover;
  display: none;
  padding: 5px;
  &.top    { margin-top:  -5px; }

--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -22,6 +22,7 @@
  .modal {
    width: auto;
    margin: 0;
+    &.fade.in { top: auto; }
  }
  // Remove the horizontal form styles
@@ -205,6 +206,9 @@
  .container {
    width: @siteWidth;
  }
+  .row {
+    margin-left: @gridGutterWidth * -1;
+  }
  [class*="span"] {
    margin-left: @gridGutterWidth;
  }
@@ -238,4 +242,4 @@
  .offset12  { .offset(12); }
 }
 */
\ No newline at end of file
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -29,21 +29,23 @@ body {
  padding-right: 20px;
  .clearfix();
 }
 // Sidebars (left and right options)
-.fluid-sidebar-left,
+.fluid-sidebar {
-.fluid-sidebar-right {
+  width: @fluidSidebarWidth;
-  width: 220px;
+  margin: 0 20px 18px;
 }
-.fluid-sidebar-left   { float: left; }
+.sidebar-left   { padding-left: @fluidSidebarWidth + 40; }
-.fluid-sidebar-right  { float: right; }
+.sidebar-right  { padding-right: @fluidSidebarWidth + 40; }
+// Float the sidebars accordingly
+.sidebar-left .fluid-sidebar   { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; }
+.sidebar-right .fluid-sidebar  { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; }
 // The main content area
 .fluid-content {
-  margin-left: 240px;
+  float: left;
-}
+  width: 100%;
-// Reverse layout for sidebar on right
-.fluid-container.reverse .fluid-content {
-  margin-left: 0;
-  margin-right: 240px;
 }

--- a/lib/sidenav.less
+++ b/lib/sidenav.less
@@ -8,19 +8,22 @@
 .side-nav .nav-label,
 .side-nav .nav-item {
  display: block;
-  padding: 3px 16px;
+  padding: 3px 15px;
  text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
 .side-nav .nav-label {
  font-size: 11px;
  line-height: @baseLineHeight;
-  color: @grayDark;
+  color: @grayLight;
  text-transform: uppercase;
 }
 .side-nav .nav-group {
-  margin: 0 -1px;
+  margin: 0; // clear default ul margins
  list-style: none;
 }
+.side-nav .nav-group + .nav-label {
+  margin-top: 9px;
+}
 .side-nav .nav-item {
  font-weight: bold;
@@ -34,7 +37,7 @@
 .side-nav .active .nav-item {
  color: #fff;
  text-shadow: 0 -1px 0 rgba(0,0,0,.3);
-  #gradient > .vertical(#ccc, #aaa);
+  #gradient > .vertical(#ccc, #999);
  @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05);
  .box-shadow(@shadow);
 }
\ No newline at end of file
--- a/lib/twipsy.less
+++ b/lib/twipsy.less
@@ -3,7 +3,7 @@
 .twipsy {
  position: absolute;
-  z-index: 1000;
+  z-index: @zindexTwipsy;
  display: block;
  visibility: visible;
  padding: 5px;

--- a/lib/type.less
+++ b/lib/type.less
@@ -50,20 +50,20 @@ h3 {
    font-size: 14px;
  }
 }
+h4, h5, h6 {
+  line-height: @baseLineHeight;
+}
 h4 {
-  font-size: 16px;
+  font-size: 14px;
-  line-height: @baseLineHeight * 2;
  small {
    font-size: 12px;
  }
 }
 h5 {
-  font-size: 14px;
+  font-size: 12px;
-  line-height: @baseLineHeight;
 }
 h6 {
-  font-size: 13px;
+  font-size: 11px;
-  line-height: @baseLineHeight;
  color: @grayLight;
  text-transform: uppercase;
 }
@@ -116,7 +116,7 @@ dl {
 // Horizontal rules
 hr {
-  margin: @baseLineHeight * 1.5 0;
+  margin: @baseLineHeight 0;
  border: 0;
  border-top: 1px solid #e5e5e5;
  border-bottom: 1px solid #fff;

--- a/lib/variables.less
+++ b/lib/variables.less
@@ -43,6 +43,19 @@
 @gridGutterWidth:   20px;
 @siteWidth:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// Fluid width sidebar
+@fluidSidebarWidth: 220px;
+// Z-INDEX
+// -------
+@zindexDropdown:        1000;
+@zindexFixedNavbar:     1010;
+@zindexModalBackdrop:   1020;
+@zindexModal:           1030;
+@zindexPopover:         1040;
+@zindexTwipsy:          1050;
 // THEME VARIABLES
 // ---------------