Merge branch 'master' into bg-variant

Conflicts:
	less/mixins.less

diff --cc less/mixins.less
index 0cd060751b8c167dbcbaa32b58db37954b717dab,1edaa3f4efc24ec9a43848615227de7b05bf4c59..104590730dec99b7ae54e0880a265f7f73de6569
--- 1/less/mixins.less
--- 2/less/mixins.less
+++ b/less/mixins.less
@@@ -577,15 -577,15 +577,24 @@@
    }
  }
  
 -  &:hover {
 +// Contextual backgrounds
 +// -------------------------
 +.bg-variant(@color) {
 +  background-color: @color;
 +  a&:hover {
 +    background-color: darken(@color, 10%);
 +  }
 +}
 +
+ // Typography
+ // -------------------------
+ .text-emphasis-variant(@color) {
+   color: @color;
++  a&:hover {
+     color: darken(@color, 10%);
+   }
+ }
+ 
  // Navbar vertical align
  // -------------------------
  // Vertically center elements in the navbar.

diff --cc less/type.less
Simple merge