Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less

22 files changed, 93 insertions, 111 deletions

diff --git a/less/accordion.less b/less/accordion.less
index 00e5844a6..6b71deefc 100644
--- a/less/accordion.less
+++ b/less/accordion.less
@@ -12,7 +12,7 @@
 .accordion-group {
   margin-bottom: 2px;
   border: 1px solid #e5e5e5;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
 }
 .accordion-heading {
   border-bottom: 0;
diff --git a/less/alerts.less b/less/alerts.less
index 32a4b2312..977d960b6 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -12,7 +12,7 @@
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
   background-color: @warningBackground;
   border: 1px solid @warningBorder;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   color: @warningText;
 }
 .alert h4 {
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 98090475d..532c4d2bb 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.1.2
+ * Bootstrap v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index ed6e58adc..541bbf50d 100644
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -8,7 +8,7 @@
   margin: 0 0 @baseLineHeight;
   list-style: none;
   background-color: #f5f5f5;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   li {
     display: inline-block;
     text-shadow: 0 1px 0 @white;
diff --git a/less/button-groups.less b/less/button-groups.less
index cbf9ac10c..8a74b9e75 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -56,41 +56,25 @@
 // 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;
+  .border-top-left-radius(4px);
+  .border-bottom-left-radius(4px);
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .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;
+  .border-top-right-radius(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;
+  .border-top-left-radius(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;
+  .border-top-right-radius(6px);
+  .border-bottom-right-radius(6px);
 }
 
 // On hover/focus/active, bring the proper btn to front
diff --git a/less/buttons.less b/less/buttons.less
index 9974d8402..85eee44b0 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -19,7 +19,7 @@
   .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
   border: 1px solid @btnBorder;
   border-bottom-color: darken(@btnBorder, 10%);
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
 
   // Hover state
diff --git a/less/code.less b/less/code.less
index b26389b3e..2e26e6746 100644
--- a/less/code.less
+++ b/less/code.less
@@ -35,6 +35,7 @@ pre {
   background-color: #f5f5f5;
   border: 1px solid #ccc; // IE8 fallback
   border: 1px solid rgba(0,0,0,.15);
+  border-radius: @baseBorderRadius;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
diff --git a/less/dropdowns.less b/less/dropdowns.less
index bff96a981..f5a5462c0 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -48,7 +48,7 @@
   background-color: @dropdownBackground;
   border: 1px solid #ccc; // IE8 fallback
   border: 1px solid @dropdownBorder;
-  border-radius: 6px;
+  border-radius: @baseBorderRadius;
   .box-shadow(0 5px 10px rgba(0,0,0,.2));
   .background-clip(padding-box);
 
@@ -64,7 +64,7 @@
   }
 
   // Links within the dropdown menu
-  a {
+  li > a {
     display: block;
     padding: 3px 20px;
     clear: both;
@@ -82,7 +82,6 @@
 .dropdown-submenu:hover > a {
   text-decoration: none;
   color: @dropdownLinkColorHover;
-  background-color: @dropdownLinkBackgroundHover;
   #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
 }
 
@@ -90,10 +89,9 @@
 // ------------
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
-  color: @dropdownLinkColorHover;
+  color: @dropdownLinkColorActive;
   text-decoration: none;
   outline: 0;
-  background-color: @dropdownLinkBackgroundActive;
   #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
 }
 
@@ -108,6 +106,7 @@
 .dropdown-menu .disabled > a:hover {
   text-decoration: none;
   background-color: transparent;
+  background-image: none; // Remove CSS gradient
   cursor: default;
 }
 
@@ -157,9 +156,7 @@
   left: 100%;
   margin-top: -6px;
   margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
+  border-radius: 0 4px 4px 4px;
 }
 .dropdown-submenu:hover > .dropdown-menu {
   display: block;
@@ -171,9 +168,7 @@
   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;
+  border-radius: 4px 4px 4px 0;
 }
 
 // Caret to indicate there is a submenu
@@ -204,9 +199,7 @@
   > .dropdown-menu {
     left: -100%;
     margin-left: 10px;
-    -webkit-border-radius: 6px 0 6px 6px;
-       -moz-border-radius: 6px 0 6px 6px;
-            border-radius: 6px 0 6px 6px;
+    border-radius: 4px 0 4px 4px;
   }
 }
 
@@ -222,5 +215,4 @@
 // ---------
 .typeahead {
   margin-top: 2px; // give it some space to breathe
-  border-radius: 4px;
 }
diff --git a/less/forms.less b/less/forms.less
index 19ab1158f..81ddb002e 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -138,7 +138,6 @@ input[type="checkbox"] {
   margin: 4px 0 0;
   margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
-  cursor: pointer;
 }
 
 // Reset width of input images, buttons, radios, checkboxes
diff --git a/less/hero-unit.less b/less/hero-unit.less
index b55b0420a..4b350983e 100644
--- a/less/hero-unit.less
+++ b/less/hero-unit.less
@@ -6,6 +6,10 @@
 .hero-unit {
   padding: 60px;
   margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+  color: @heroUnitLeadColor;
   background-color: @heroUnitBackground;
   border-radius: 6px;
   h1 {
@@ -15,10 +19,7 @@
     color: @heroUnitHeadingColor;
     letter-spacing: -1px;
   }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: @baseLineHeight * 1.5;
-    color: @heroUnitLeadColor;
+  li {
+    line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less
   }
 }
diff --git a/less/modals.less b/less/modals.less
index 6745d831d..99fe2d45f 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -23,22 +23,25 @@
 // Base modal
 .modal {
   position: fixed;
-  top: 50%;
+  top: 10%;
   left: 50%;
   z-index: @zindexModal;
   width: 560px;
-  margin: -250px 0 0 -280px;
+  margin-left: -280px;
   background-color: @white;
   border: 1px solid #999;
   border: 1px solid rgba(0,0,0,.3);
   border-radius: 6px;
   .box-shadow(0 3px 7px rgba(0,0,0,0.3));
   .background-clip(padding-box);
+  // Remove focus outline from opened modal
+  outline: none;
+
   &.fade {
     .transition(e('opacity .3s linear, top .3s ease-out'));
     top: -25%;
   }
-  &.fade.in { top: 50%; }
+  &.fade.in { top: 10%; }
 }
 .modal-header {
   padding: 9px 15px;
diff --git a/less/navbar.less b/less/navbar.less
index 6ba70cdbc..3bfc8ae6e 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -14,7 +14,7 @@
   color: @navbarText;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
   border: 1px solid @navbarBorder;
-  border-radius: 6px;
+  border-radius: @baseBorderRadius;
   .box-shadow(0 1px 4px rgba(0,0,0,.065));
 
   // Prevent floats from breaking the navbar
diff --git a/less/progress-bars.less b/less/progress-bars.less
index f7305113e..584ef96bb 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -48,7 +48,7 @@
   margin-bottom: @baseLineHeight;
   #gradient > .vertical(#f5f5f5, #f9f9f9);
   .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
 }
 
 // Bar of progress
diff --git a/less/reset.less b/less/reset.less
index 7cbfa48f4..e8e5c1589 100644
--- a/less/reset.less
+++ b/less/reset.less
@@ -111,10 +111,18 @@ input[type="submit"] {
     -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
     cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
 }
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
+}
 input[type="search"] { // Appearance in Safari/Chrome
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
+  .box-sizing(content-box);
   -webkit-appearance: textfield;
 }
 input[type="search"]::-webkit-search-decoration,
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index bbfe52c97..190ebb858 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -75,7 +75,7 @@
   .nav-collapse .btn {
     padding: 4px 10px 4px;
     font-weight: normal;
-    border-radius: 4px;
+    border-radius: @baseBorderRadius;
   }
   .nav-collapse .dropdown-menu li + li a {
     margin-bottom: 2px;
@@ -84,6 +84,10 @@
   .nav-collapse .dropdown-menu a:hover {
     background-color: @navbarBackground;
   }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: @navbarInverseLinkColor;
+  }
   .navbar-inverse .nav-collapse .nav > li > a:hover,
   .navbar-inverse .nav-collapse .dropdown-menu a:hover {
     background-color: @navbarInverseBackground;
@@ -99,7 +103,7 @@
     top: auto;
     left: auto;
     float: none;
-    display: block;
+    display: none;
     max-width: none;
     margin: 0 15px;
     padding: 0;
@@ -108,6 +112,10 @@
     border-radius: 0;
     .box-shadow(none);
   }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after {
     display: none;
diff --git a/less/responsive.less b/less/responsive.less
index e56042e4e..aa28baaec 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.1.2
+ * Bootstrap Responsive v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
diff --git a/less/tables.less b/less/tables.less
index 911ef67af..44c3909b7 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -70,7 +70,7 @@ table {
   border: 1px solid @tableBorder;
   border-collapse: separate; // Done so we can round those corners!
   border-left: 0;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   th,
   td {
     border-left: 1px solid @tableBorder;
@@ -90,31 +90,22 @@ table {
   // For first th or td in the first row in the first thead or tbody
   thead:first-child tr:first-child th:first-child,
   tbody:first-child tr:first-child td:first-child {
-    -webkit-border-top-left-radius: 4px;
-            border-top-left-radius: 4px;
-        -moz-border-radius-topleft: 4px;
+    .border-top-left-radius(4px);
   }
   thead:first-child tr:first-child th:last-child,
   tbody:first-child tr:first-child td:last-child {
-    -webkit-border-top-right-radius: 4px;
-            border-top-right-radius: 4px;
-        -moz-border-radius-topright: 4px;
+    .border-top-right-radius(4px);
   }
   // For first th or td in the first row in the first thead or tbody
   thead:last-child tr:last-child th:first-child,
   tbody:last-child tr:last-child td:first-child,
   tfoot:last-child tr:last-child td:first-child {
-    border-radius: 0 0 0 4px;
-    -webkit-border-bottom-left-radius: 4px;
-            border-bottom-left-radius: 4px;
-        -moz-border-radius-bottomleft: 4px;
+    .border-bottom-left-radius(4px);
   }
   thead:last-child tr:last-child th:last-child,
   tbody:last-child tr:last-child td:last-child,
   tfoot:last-child tr:last-child td:last-child {
-    -webkit-border-bottom-right-radius: 4px;
-            border-bottom-right-radius: 4px;
-        -moz-border-radius-bottomright: 4px;
+    .border-bottom-right-radius(4px);
   }
 
   // Special fixes to round the left border on the first td/th
@@ -122,17 +113,13 @@ table {
   caption + tbody tr:first-child td:first-child,
   colgroup + thead tr:first-child th:first-child,
   colgroup + tbody tr:first-child td:first-child {
-    -webkit-border-top-left-radius: 4px;
-            border-top-left-radius: 4px;
-        -moz-border-radius-topleft: 4px;
+    .border-top-left-radius(4px);
   }
   caption + thead tr:first-child th:last-child,
   caption + tbody tr:first-child td:last-child,
   colgroup + thead tr:first-child th:last-child,
   colgroup + tbody tr:first-child td:last-child {
-    -webkit-border-top-right-radius: 4px;
-            border-top-right-radius: 4px;
-        -moz-border-radius-topright: 4px;
+    .border-top-right-radius(4px);
   }
 
 }
@@ -172,7 +159,10 @@ table {
 // -----------------
 
 // Reset default grid behavior
-table [class*=span] {
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
   display: table-cell;
   float: none; // undo default grid column styles
   margin-left: 0; // undo default grid column styles
diff --git a/less/thumbnails.less b/less/thumbnails.less
index c9b2b09da..d2a23c7f3 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -9,7 +9,7 @@
   padding: 4px;
   line-height: @baseLineHeight;
   border: 1px solid #ddd;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   .box-shadow(0 1px 3px rgba(0,0,0,.055));
   .transition(all .2s ease-in-out);
 }
diff --git a/less/tooltip.less b/less/tooltip.less
index 821325fac..0d8eb4f1c 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -27,7 +27,7 @@
   text-align: center;
   text-decoration: none;
   background-color: @tooltipBackground;
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
 }
 
 // Arrows
diff --git a/less/type.less b/less/type.less
index 4c3948e91..0aa8c802c 100644
--- a/less/type.less
+++ b/less/type.less
@@ -20,33 +20,27 @@ p {
 // Emphasis & misc
 // -------------------------
 
-small {
-  font-size: 85%; // Ex: 14px base font * 85% = about 12px
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-cite {
-  font-style: normal;
-}
+// Ex: 14px base font * 85% = about 12px
+small   { font-size: 85%; }
+
+strong  { font-weight: bold; }
+em      { font-style: italic; }
+cite    { font-style: normal; }
 
 // Utility classes
-.muted {
-  color: @grayLight;
-}
-.text-warning { color: @warningText; }
+.muted               { color: @grayLight; }
+a.muted:hover        { color: darken(@grayLight, 10%); }
+
+.text-warning        { color: @warningText; }
 a.text-warning:hover { color: darken(@warningText, 10%); }
 
-.text-error { color: @errorText; }
-a.text-error:hover { color: darken(@errorText, 10%); }
+.text-error          { color: @errorText; }
+a.text-error:hover   { color: darken(@errorText, 10%); }
 
-.text-info { color: @infoText; }
-a.text-info:hover { color: darken(@infoText, 10%); }
+.text-info           { color: @infoText; }
+a.text-info:hover    { color: darken(@infoText, 10%); }
 
-.text-success { color: @successText; }
+.text-success        { color: @successText; }
 a.text-success:hover { color: darken(@successText, 10%); }
 
 
@@ -158,7 +152,9 @@ hr {
 }
 
 // Abbreviations and acronyms
-abbr[title] {
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted @grayLight;
 }
diff --git a/less/variables.less b/less/variables.less
index 5dd90206c..783652333 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -69,7 +69,7 @@
 @paddingMini:           1px 6px;   // 24px
 
 @baseBorderRadius:      4px;
-@borderRadiusLarge:     5px;
+@borderRadiusLarge:     6px;
 @borderRadiusSmall:     3px;
 
 
@@ -126,7 +126,7 @@
 
 @dropdownLinkColor:             @grayDark;
 @dropdownLinkColorHover:        @white;
-@dropdownLinkColorActive:       @dropdownLinkColor;
+@dropdownLinkColorActive:       @white;
 
 @dropdownLinkBackgroundActive:  @linkColor;
 @dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
diff --git a/less/wells.less b/less/wells.less
index dc80db21a..33cd07a98 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -10,7 +10,7 @@
   margin-bottom: 20px;
   background-color: @wellBackground;
   border: 1px solid darken(@wellBackground, 7%);
-  border-radius: 4px;
+  border-radius: @baseBorderRadius;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
@@ -21,9 +21,9 @@
 // Sizes
 .well-large {
   padding: 24px;
-  border-radius: 6px;
+  border-radius: @borderRadiusLarge;
 }
 .well-small {
   padding: 9px;
-  border-radius: 3px;
+  border-radius: @borderRadiusSmall;
 }