Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less

diff --cc Makefile
Simple merge

diff --cc docs/assets/css/bootstrap.css
index 84715df6fd1abb0efdf598b3585ceff7185db0d3,70835bcc989377e18c96dbbb80568365e90bfff6..aa250e0c7c2a8e1e76a6781ffd3059b215c736c3
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -3755,10 -4240,16 +3755,9 @@@ input[type="button"].btn-block 
  }
  
  .navbar {
 -  *position: relative;
 -  *z-index: 2;
 +  padding: 0 20px;
    margin-bottom: 20px;
    overflow: visible;
-   color: #777777;
 -}
 -
 -.navbar-inner {
 -  min-height: 40px;
 -  padding-right: 20px;
 -  padding-left: 20px;
    background-color: #fafafa;
    background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
@@@ -3810,7 -4305,8 +3809,8 @@@
  
  .navbar-text {
    margin-bottom: 0;
 -  line-height: 40px;
 +  line-height: 44px;
+   color: #777777;
  }
  
  .navbar-link {
@@@ -4125,11 -4651,12 +4125,10 @@@
    left: auto;
    margin-right: -1px;
    margin-left: 0;
 -  -webkit-border-radius: 6px 0 6px 6px;
 -     -moz-border-radius: 6px 0 6px 6px;
 -          border-radius: 6px 0 6px 6px;
 +  border-radius: 6px 0 6px 6px;
  }
  
 -.navbar-inverse .navbar-inner {
 +.navbar-inverse {
-   color: #999999;
    background-color: #1b1b1b;
    background-image: -moz-linear-gradient(top, #222222, #111111);
    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));

diff --cc docs/index.html
Simple merge

diff --cc docs/templates/pages/index.mustache
Simple merge

diff --cc less/bootstrap.less
Simple merge

diff --cc less/navbar.less
index c0d4b205f7647218adf2f6de8a377fedc77c4470,532c5926b81dc9dc2ec5046091c1582b618fe479..433ebe024d55fc40ce6df64a0fa28d3e1a2491b4
--- 1/less/navbar.less
--- 2/less/navbar.less
+++ b/less/navbar.less
@@@ -9,12 -9,22 +9,11 @@@
  // Base class and wrapper
  .navbar {
    overflow: visible;
 +  padding: 0 20px;
    margin-bottom: @baseLineHeight;
-   color: @navbarText;
 -
 -  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
 -  *position: relative;
 -  *z-index: 2;
 -}
 -
 -// Inner for background effects
 -// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
 -.navbar-inner {
 -  min-height: @navbarHeight;
 -  padding-left:  20px;
 -  padding-right: 20px;
    #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
    border: 1px solid @navbarBorder;
 -  .border-radius(@baseBorderRadius);
 +  border-radius: @baseBorderRadius;
    .box-shadow(0 1px 4px rgba(0,0,0,.065));
  
    // Prevent floats from breaking the navbar
@@@ -356,9 -379,11 +356,8 @@@
  // -------------------------
  
  .navbar-inverse {
-   color: @navbarInverseText;
 -
 -  .navbar-inner {
 -    #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
 -    border-color: @navbarInverseBorder;
 -  }
 +  #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
 +  border-color: @navbarInverseBorder;
  
    .brand,
    .nav > li > a {

diff --cc less/variables.less
Simple merge