Merge branch '2.1.2-wip' into box-sizing-exercise

Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache

1 files changed, 76 insertions, 40 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b3adee666..f53a3b458 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.1
+ * Bootstrap v2.1.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -67,6 +67,7 @@ sub {
 }
 
 img {
+  width: auto\9;
   height: auto;
   max-width: 100%;
   vertical-align: middle;
@@ -376,7 +377,7 @@ p {
 
 .lead {
   margin-bottom: 20px;
-  font-size: 20px;
+  font-size: 21px;
   font-weight: 200;
   line-height: 30px;
 }
@@ -401,6 +402,22 @@ cite {
   color: #999999;
 }
 
+.text-warning {
+  color: #c09853;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+.text-success {
+  color: #468847;
+}
+
 h1,
 h2,
 h3,
@@ -848,7 +865,7 @@ input[type="file"] {
 select {
   width: 220px;
   background-color: #ffffff;
-  border: 1px solid #bbb;
+  border: 1px solid #cccccc;
 }
 
 select[multiple],
@@ -1644,7 +1661,7 @@ table {
 .table-bordered colgroup + tbody tr:first-child td:last-child {
   -webkit-border-top-right-radius: 4px;
           border-top-right-radius: 4px;
-  -moz-border-radius-topleft: 4px;
+  -moz-border-radius-topright: 4px;
 }
 
 .table-striped tbody tr:nth-child(odd) td,
@@ -1664,145 +1681,145 @@ table [class*=span],
   margin-left: 0;
 }
 
-table .span1 {
+.table .span1 {
   float: none;
   width: 44px;
   margin-left: 0;
 }
 
-table .span2 {
+.table .span2 {
   float: none;
   width: 124px;
   margin-left: 0;
 }
 
-table .span3 {
+.table .span3 {
   float: none;
   width: 204px;
   margin-left: 0;
 }
 
-table .span4 {
+.table .span4 {
   float: none;
   width: 284px;
   margin-left: 0;
 }
 
-table .span5 {
+.table .span5 {
   float: none;
   width: 364px;
   margin-left: 0;
 }
 
-table .span6 {
+.table .span6 {
   float: none;
   width: 444px;
   margin-left: 0;
 }
 
-table .span7 {
+.table .span7 {
   float: none;
   width: 524px;
   margin-left: 0;
 }
 
-table .span8 {
+.table .span8 {
   float: none;
   width: 604px;
   margin-left: 0;
 }
 
-table .span9 {
+.table .span9 {
   float: none;
   width: 684px;
   margin-left: 0;
 }
 
-table .span10 {
+.table .span10 {
   float: none;
   width: 764px;
   margin-left: 0;
 }
 
-table .span11 {
+.table .span11 {
   float: none;
   width: 844px;
   margin-left: 0;
 }
 
-table .span12 {
+.table .span12 {
   float: none;
   width: 924px;
   margin-left: 0;
 }
 
-table .span13 {
+.table .span13 {
   float: none;
   width: 1004px;
   margin-left: 0;
 }
 
-table .span14 {
+.table .span14 {
   float: none;
   width: 1084px;
   margin-left: 0;
 }
 
-table .span15 {
+.table .span15 {
   float: none;
   width: 1164px;
   margin-left: 0;
 }
 
-table .span16 {
+.table .span16 {
   float: none;
   width: 1244px;
   margin-left: 0;
 }
 
-table .span17 {
+.table .span17 {
   float: none;
   width: 1324px;
   margin-left: 0;
 }
 
-table .span18 {
+.table .span18 {
   float: none;
   width: 1404px;
   margin-left: 0;
 }
 
-table .span19 {
+.table .span19 {
   float: none;
   width: 1484px;
   margin-left: 0;
 }
 
-table .span20 {
+.table .span20 {
   float: none;
   width: 1564px;
   margin-left: 0;
 }
 
-table .span21 {
+.table .span21 {
   float: none;
   width: 1644px;
   margin-left: 0;
 }
 
-table .span22 {
+.table .span22 {
   float: none;
   width: 1724px;
   margin-left: 0;
 }
 
-table .span23 {
+.table .span23 {
   float: none;
   width: 1804px;
   margin-left: 0;
 }
 
-table .span24 {
+.table .span24 {
   float: none;
   width: 1884px;
   margin-left: 0;
@@ -1857,8 +1874,6 @@ table .span24 {
 /* White icons with optional class, or on hover/active states of certain elements */
 
 .icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
 .nav-pills > .active > a > [class^="icon-"],
 .nav-pills > .active > a > [class*=" icon-"],
 .nav-list > .active > a > [class^="icon-"],
@@ -2604,6 +2619,16 @@ table .span24 {
   display: block;
 }
 
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
 .dropdown-submenu > a:after {
   display: block;
   float: right;
@@ -3106,7 +3131,8 @@ input[type="submit"].btn.btn-mini {
 }
 
 .btn-link,
-.btn-link:active {
+.btn-link:active,
+.btn-link[disabled] {
   background-color: transparent;
   background-image: none;
   -webkit-box-shadow: none;
@@ -3129,6 +3155,11 @@ input[type="submit"].btn.btn-mini {
   background-color: transparent;
 }
 
+.btn-link[disabled]:hover {
+  color: #333333;
+  text-decoration: none;
+}
+
 .btn-group {
   position: relative;
   *margin-left: .3em;
@@ -4520,8 +4551,8 @@ input[type="submit"].btn.btn-mini {
   display: inline;
 }
 
-.pager a,
-.pager span {
+.pager li > a,
+.pager li > span {
   display: inline-block;
   padding: 5px 14px;
   background-color: #fff;
@@ -4531,23 +4562,24 @@ input[type="submit"].btn.btn-mini {
           border-radius: 15px;
 }
 
-.pager a:hover {
+.pager li > a:hover {
   text-decoration: none;
   background-color: #f5f5f5;
 }
 
-.pager .next a,
-.pager .next span {
+.pager .next > a,
+.pager .next > span {
   float: right;
 }
 
-.pager .previous a {
+.pager .previous > a,
+.pager .previous > span {
   float: left;
 }
 
-.pager .disabled a,
-.pager .disabled a:hover,
-.pager .disabled span {
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > span {
   color: #999999;
   cursor: default;
   background-color: #fff;
@@ -4683,6 +4715,10 @@ input[type="submit"].btn.btn-mini {
   margin-left: -1px;
 }
 
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
 .tooltip {
   position: absolute;
   z-index: 1030;