Merge branch '2.2.2-wip' into exploratory

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

less/navbar.less

@@ -11,7 +11,6 @@
   overflow: visible;
   padding: 0 20px;
   margin-bottom: @baseLineHeight;
-  color: @navbarText;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
   border: 1px solid @navbarBorder;
   border-radius: @baseBorderRadius;
@@ -56,6 +55,7 @@
 .navbar-text {
   margin-bottom: 0;
   line-height: @navbarHeight;
+  color: @navbarText;
 }
 
 // Janky solution for now to account for links outside the .nav
@@ -356,7 +356,6 @@
 // -------------------------
 
 .navbar-inverse {
-  color: @navbarInverseText;
   #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
   border-color: @navbarInverseBorder;
 
@@ -369,6 +368,10 @@
     }
   }
 
+  .navbar-text {
+    color: @navbarInverseText;
+  }
+
   .nav > li > a:focus,
   .nav > li > a:hover {
     background-color: @navbarInverseLinkBackgroundHover;
@@ -444,6 +447,3 @@
   }
 
 }
-
-
-