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

3 files changed, 358 insertions, 204 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 631c904e7..44e0125c1 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -77,6 +77,9 @@
     width: auto;
     padding: 0 20px;
   }
+  .row-fluid {
+    width: 100%;
+  }
   .row {
     margin-left: 0;
   }
@@ -89,81 +92,122 @@
 }
 @media (min-width: 768px) and (max-width: 940px) {
   .container {
-    width: 748px;
-    padding-left: 10px;
-    padding-right: 10px;
+    width: 724px;
+    padding-left: 20px;
+    padding-right: 20px;
   }
   .span1 {
-    width: 44px;
+    width: 42px;
   }
   .span2 {
-    width: 108px;
+    width: 104px;
   }
   .span3 {
-    width: 172px;
+    width: 166px;
   }
   .span4 {
-    width: 236px;
+    width: 228px;
   }
   .span5 {
-    width: 300px;
+    width: 290px;
   }
   .span6 {
-    width: 364px;
+    width: 352px;
   }
   .span7 {
-    width: 428px;
+    width: 414px;
   }
   .span8 {
-    width: 492px;
+    width: 476px;
   }
   .span9 {
-    width: 556px;
+    width: 538px;
   }
   .span10 {
-    width: 620px;
+    width: 600px;
   }
   .span11 {
-    width: 684px;
+    width: 662px;
   }
   .span12 {
-    width: 748px;
+    width: 724px;
   }
   .offset1 {
-    margin-left: 84px;
+    margin-left: 82px;
   }
   .offset2 {
-    margin-left: 148px;
+    margin-left: 144px;
   }
   .offset3 {
-    margin-left: 212px;
+    margin-left: 206px;
   }
   .offset4 {
-    margin-left: 276px;
+    margin-left: 268px;
   }
   .offset5 {
-    margin-left: 340px;
+    margin-left: 330px;
   }
   .offset6 {
-    margin-left: 404px;
+    margin-left: 392px;
   }
   .offset7 {
-    margin-left: 468px;
+    margin-left: 454px;
   }
   .offset8 {
-    margin-left: 532px;
+    margin-left: 516px;
   }
   .offset9 {
-    margin-left: 596px;
+    margin-left: 578px;
   }
   .offset10 {
-    margin-left: 660px;
+    margin-left: 640px;
   }
   .offset11 {
-    margin-left: 724px;
+    margin-left: 702px;
+  }
+  .row-fluid {
+    width: 102.76243093919337%;
+    margin-left: -2.762430939%;
+  }
+  .row-fluid [class*="span"] {
+    float: left;
+    margin-left: 2.762430939%;
+  }
+  .row-fluid .span1 {
+    width: 5.6451612899588115%;
+  }
+  .row-fluid .span2 {
+    width: 13.978494622708812%;
+  }
+  .row-fluid .span3 {
+    width: 22.31182795545881%;
+  }
+  .row-fluid .span4 {
+    width: 30.64516128820881%;
+  }
+  .row-fluid .span5 {
+    width: 38.97849462095881%;
+  }
+  .row-fluid .span6 {
+    width: 47.311827953708814%;
   }
-  .offset12 {
-    margin-left: 788px;
+  .row-fluid .span7 {
+    width: 55.645161286458816%;
+  }
+  .row-fluid .span8 {
+    width: 63.97849461920882%;
+  }
+  .row-fluid .span9 {
+    width: 72.31182795195882%;
+  }
+  .row-fluid .span10 {
+    width: 80.64516128470882%;
+  }
+  .row-fluid .span11 {
+    width: 88.97849461745884%;
+  }
+  .row-fluid .span12 {
+    width: 97.31182795020881%;
   }
 }
 @media (max-width: 940px) {
@@ -172,25 +216,26 @@
   }
   .navbar-fixed-top {
     position: static;
-    margin-bottom: 36px;
+    margin-bottom: 18px;
   }
   .navbar-inner {
-    padding: 10px;
+    padding: 5px;
     background-image: none;
   }
   .navbar .container {
     padding: 0;
   }
   .navbar .brand {
-    float: none;
-    display: block;
-    padding-left: 15px;
-    padding-right: 15px;
-    margin: 0;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .navbar .nav-collapse {
+    clear: left;
   }
   .navbar .nav {
     float: none;
-    margin: 9px 0;
+    margin: 0 0 9px;
   }
   .navbar .nav > li {
     float: none;
@@ -217,8 +262,10 @@
   }
   .navbar .dropdown-menu {
     position: static;
-    display: block;
+    top: auto;
+    left: auto;
     float: none;
+    display: block;
     max-width: none;
     margin: 0 15px;
     padding: 0;
@@ -263,60 +310,133 @@
     height: 0;
   }
 }
-/*
-@media (min-width: 1210px) {
-
-  // Reset grid variables
-  @gridColumns:       12;
-  @gridColumnWidth:   70px;
-  @gridGutterWidth:   30px;
-  @siteWidth:         1170px;
-
-  // Bring grid mixins to recalculate widths
-  .columns(@columns: 1) {
-    width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-  }
-  .offset(@columns: 1) {
-    margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
-  }
-
+@media (min-width: 1200px) {
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
   .container {
-    width: @siteWidth;
+    width: 1170px;
   }
   .row {
-    margin-left: @gridGutterWidth * -1;
+    margin-left: -30px;
   }
   [class*="span"] {
-    margin-left: @gridGutterWidth;
-  }
-
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
-
+    margin-left: 30px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .row-fluid {
+    width: 102.56143440326584%;
+    margin-left: -2.56%;
+  }
+  .row-fluid [class*="span"] {
+    float: left;
+    margin-left: 2.56%;
+  }
+  .row-fluid .span1 {
+    width: 5.832601732615312%;
+  }
+  .row-fluid .span2 {
+    width: 14.16126839928198%;
+  }
+  .row-fluid .span3 {
+    width: 22.489935065948643%;
+  }
+  .row-fluid .span4 {
+    width: 30.818601732615313%;
+  }
+  .row-fluid .span5 {
+    width: 39.14726839928198%;
+  }
+  .row-fluid .span6 {
+    width: 47.47593506594863%;
+  }
+  .row-fluid .span7 {
+    width: 55.8046017326153%;
+  }
+  .row-fluid .span8 {
+    width: 64.13326839928197%;
+  }
+  .row-fluid .span9 {
+    width: 72.46193506594864%;
+  }
+  .row-fluid .span10 {
+    width: 80.7906017326153%;
+  }
+  .row-fluid .span11 {
+    width: 89.11926839928198%;
+  }
+  .row-fluid .span12 {
+    width: 97.44793506594864%;
+  }
 }
-*/
\ No newline at end of file
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e928bb6d1..675446f62 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -126,7 +126,7 @@ a:hover {
   margin-left: 20px;
 }
 .span1 {
-  width: 60px;
+  width: 59.99999999999999px;
 }
 .span2 {
   width: 140px;
@@ -194,6 +194,50 @@ a:hover {
 .offset11 {
   margin-left: 900px;
 }
+.row-fluid {
+  width: 102.12765957421277%;
+  margin-left: -2.127659574%;
+}
+.row-fluid [class*="span"] {
+  float: left;
+  margin-left: 2.127659574%;
+}
+.row-fluid .span1 {
+  width: 6.249999999619791%;
+}
+.row-fluid .span2 {
+  width: 14.58333333211979%;
+}
+.row-fluid .span3 {
+  width: 22.91666666461979%;
+}
+.row-fluid .span4 {
+  width: 31.24999999711979%;
+}
+.row-fluid .span5 {
+  width: 39.58333332961979%;
+}
+.row-fluid .span6 {
+  width: 47.91666666211979%;
+}
+.row-fluid .span7 {
+  width: 56.24999999461979%;
+}
+.row-fluid .span8 {
+  width: 64.58333332711977%;
+}
+.row-fluid .span9 {
+  width: 72.91666665961978%;
+}
+.row-fluid .span10 {
+  width: 81.24999999211977%;
+}
+.row-fluid .span11 {
+  width: 89.58333332461977%;
+}
+.row-fluid .span12 {
+  width: 97.91666665711978%;
+}
 .container {
   width: 940px;
   margin-left: auto;
@@ -207,42 +251,18 @@ a:hover {
 .container:after {
   clear: both;
 }
-.fluid-container {
-  position: relative;
-  min-width: 940px;
+.container-fluid {
   padding-left: 20px;
   padding-right: 20px;
   *zoom: 1;
 }
-.fluid-container:before, .fluid-container:after {
+.container-fluid:before, .container-fluid:after {
   display: table;
   content: "";
 }
-.fluid-container:after {
+.container-fluid:after {
   clear: both;
 }
-.fluid-sidebar {
-  width: 220px;
-  margin: 0 20px 18px;
-}
-.sidebar-left {
-  padding-left: 260px;
-}
-.sidebar-right {
-  padding-right: 260px;
-}
-.sidebar-left .fluid-sidebar {
-  float: left;
-  margin-left: -240px;
-}
-.sidebar-right .fluid-sidebar {
-  float: right;
-  margin-right: -240px;
-}
-.fluid-content {
-  float: left;
-  width: 100%;
-}
 p {
   margin: 0 0 9px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -596,6 +616,9 @@ input[type="hidden"] {
 .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
   margin-left: 10px;
 }
+.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
+  padding-top: 5px;
+}
 input, textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -940,9 +963,20 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   display: inline-block;
   margin-bottom: 0;
 }
-.form-search label, .form-inline label {
+.form-search label,
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
   display: inline-block;
 }
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
+}
 .control-group {
   margin-bottom: 9px;
 }
@@ -1999,6 +2033,7 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .alert .close {
   position: relative;
+  top: -2px;
   right: -21px;
   line-height: 18px;
 }
@@ -2292,9 +2327,11 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .navbar {
   overflow: visible;
+  margin-bottom: 18px;
 }
 .navbar-inner {
-  background-color: #222222;
+  padding-left: 20px;
+  padding-right: 20px;
   background-color: #2c2c2c;
   background-image: -moz-linear-gradient(top, #333333, #222222);
   background-image: -ms-linear-gradient(top, #333333, #222222);
@@ -2304,6 +2341,9 @@ button.btn.small, input[type="submit"].btn.small {
   background-image: linear-gradient(top, #333333, #222222);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
@@ -2312,8 +2352,8 @@ button.btn.small, input[type="submit"].btn.small {
   display: none;
   float: right;
   padding: 7px 10px;
-  margin-left: 10px;
-  margin-right: 10px;
+  margin-left: 5px;
+  margin-right: 5px;
   background-color: #2c2c2c;
   background-image: -moz-linear-gradient(top, #333333, #222222);
   background-image: -ms-linear-gradient(top, #333333, #222222);
@@ -2355,6 +2395,9 @@ button.btn.small, input[type="submit"].btn.small {
 .btn-navbar .i-bar + .i-bar {
   margin-top: 3px;
 }
+.nav-collapse.collapse {
+  height: auto !important;
+}
 .navbar .brand:hover {
   text-decoration: none;
 }
@@ -2445,16 +2488,6 @@ button.btn.small, input[type="submit"].btn.small {
   box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
   outline: 0;
 }
-.navbar-static {
-  margin-bottom: 18px;
-}
-.navbar-static .navbar-inner {
-  padding-left: 20px;
-  padding-right: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
 .navbar-fixed-top {
   position: fixed;
   top: 0;
@@ -2462,6 +2495,13 @@ button.btn.small, input[type="submit"].btn.small {
   left: 0;
   z-index: 1030;
 }
+.navbar-fixed-top .navbar-inner {
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
 .navbar .nav {
   position: relative;
   left: 0;
@@ -2667,12 +2707,17 @@ button.btn.small, input[type="submit"].btn.small {
 }
 .pager a {
   display: inline-block;
-  padding: 6px 15px;
-  background-color: #f5f5f5;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
   -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
   border-radius: 15px;
 }
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
 .pager .next a {
   float: right;
 }
@@ -2981,6 +3026,8 @@ a.thumbnail:hover {
 .thumbnail > img {
   display: block;
   max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
 }
 .thumbnail .caption {
   padding: 9px;
@@ -2996,16 +3043,16 @@ a.thumbnail:hover {
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-.label.important {
+.label-important {
   background-color: #b94a48;
 }
-.label.warning {
+.label-warning {
   background-color: #f89406;
 }
-.label.success {
+.label-success {
   background-color: #468847;
 }
-.label.info {
+.label-info {
   background-color: #3a87ad;
 }
 @-webkit-keyframes progress-bar-stripes {
@@ -3080,7 +3127,7 @@ a.thumbnail:hover {
   -o-transition: width 0.6s ease;
   transition: width 0.6s ease;
 }
-.progress.striped .bar {
+.progress-striped .bar {
   background-color: #62c462;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3098,7 +3145,7 @@ a.thumbnail:hover {
   -moz-animation: progress-bar-stripes 2s linear infinite;
   animation: progress-bar-stripes 2s linear infinite;
 }
-.progress.danger .bar {
+.progress-danger .bar {
   background-color: #dd514c;
   background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
   background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
@@ -3109,7 +3156,7 @@ a.thumbnail:hover {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
 }
-.progress.danger.striped .bar {
+.progress-danger.progress-striped .bar {
   background-color: #ee5f5b;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3118,7 +3165,7 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
-.progress.success .bar {
+.progress-success .bar {
   background-color: #5eb95e;
   background-image: -moz-linear-gradient(top, #62c462, #57a957);
   background-image: -ms-linear-gradient(top, #62c462, #57a957);
@@ -3129,7 +3176,7 @@ a.thumbnail:hover {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
 }
-.progress.success.striped .bar {
+.progress-success.progress-striped .bar {
   background-color: #62c462;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3138,7 +3185,7 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
-.progress.info .bar {
+.progress-info .bar {
   background-color: #4bb1cf;
   background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
   background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
@@ -3149,7 +3196,7 @@ a.thumbnail:hover {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
 }
-.progress.info.striped .bar {
+.progress-info.progress-striped .bar {
   background-color: #5bc0de;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -3162,7 +3209,8 @@ a.thumbnail:hover {
   margin-bottom: 18px;
 }
 .accordion-group {
-  background-color: #f5f5f5;
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -3174,9 +3222,6 @@ a.thumbnail:hover {
   display: block;
   padding: 8px 15px;
 }
-.accordion-body {
-  margin-bottom: 2px;
-}
 .accordion-inner {
   padding: 9px 15px;
   border-top: 1px solid #e5e5e5;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b06065365..74b548628 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -106,35 +106,6 @@ hr.soften {
 }
 
 
-/* Benefits list in masthead */
-.benefits {
-  display: none;
-  width: 260px;
-  position: absolute;
-  right: 0;
-  bottom: 0;
-}
-.benefits ul {
-  list-style: none;
-  margin: 0;
-}
-.benefits li {
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 35px;
-  color: #555;
-}
-.benefits li + li {
-  border-top: 1px solid #f5f5f5;
-}
-.benefits h4 {
-  color: #555;
-}
-.benefits span {
-  padding-right: 5px;
-  color: #999;
-}
-
 /* Specific jumbotrons
 ------------------------- */
 /* supporting docs pages */
@@ -175,7 +146,6 @@ hr.soften {
   margin: 0;
   padding-top:    11px;
   padding-bottom: 11px;
-  font-size: 13px;
   border-left: 1px solid #f5f5f5;
   border-right: 1px solid #e5e5e5;
   -webkit-border-radius: 0;
@@ -500,6 +470,30 @@ hr.soften {
 
 
 
+/* Color swatches on LESS docs page
+-------------------------------------------------- */
+/* Sets the width of the td */
+.swatch-col {
+  width: 30px;
+}
+/* Le swatch */
+.swatch {
+  display: inline-block;
+  width: 30px;
+  height: 20px;
+  margin: -6px 0;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+/* For white swatches, give a border */
+.swatch-bordered {
+  width: 28px;
+  height: 18px;
+  border: 1px solid #eee;
+}
+
+
 /* Misc
 -------------------------------------------------- */
 
@@ -522,6 +516,7 @@ h2 + .row {
 /* Example sites showcase */
 .example-sites img {
   max-width: 100%;
+  margin: 0 auto;
 }
 .marketing-byline {
   margin: -18px 0 27px;
@@ -548,19 +543,6 @@ form.well {
   margin: 18px 0;
 }
 
-/* Form docs for horizontal forms */
-.form-docs {
-  padding-left: 10px;
-}
-.form-docs h3,
-.form-docs p,
-.form-docs li {
-  color: #777;
-}
-.form-docs hr {
-  margin: 18px 0;
-}
-
 /* Fake the :focus state to demo it */
 .focused {
   border-color: rgba(82,168,236,.8);
@@ -646,6 +628,10 @@ form.well {
     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 {
@@ -669,8 +655,9 @@ form.well {
     display: block;
     max-width: 300px;
     margin: 0 auto 18px;
+    text-align: center;
   }
-  .example-sites img {
+  .example-sites .thumbnail > img {
     max-width: 270px;
   }
 
@@ -689,17 +676,8 @@ form.well {
     left: auto;
   }
 
-  /* Forms docs */
-  .form-docs {
-    padding-left: 0; /* down from 10px */
-  }
 }
 
-@media (min-width: 940px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-  }
-}
 
 @media (max-width: 768px) {
 
@@ -726,7 +704,7 @@ form.well {
   .subnav .nav > li > a {
     border: 0;
   }
-  .subnav .nav > li + li a {
+  .subnav .nav > li + li > a {
     border-top: 1px solid #e5e5e5;
   }
 
@@ -792,15 +770,26 @@ form.well {
 
 }
 
+
 @media (max-width: 940px) {
 
   /* Unfloat brand */
   .navbar-fixed-top .brand {
-    float: none;
+    float: left;
     margin-left: 0;
-    padding-left: 15px;
-    padding-right: 15px;
+    padding-left: 10px;
+    padding-right: 10px;
   }
 
 }
 
+
+/* LARGE DESKTOP SCREENS */
+@media (min-width: 1210px) {
+
+  /* Update subnav container */
+  .subnav-fixed .nav {
+    width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */
+  }
+
+}