From: Mark Otto <otto@github.com>
Date: Sat, 18 Jan 2014 22:40:17 +0000 (-0800)
Subject: Merge branch 'master' into bg-variant
X-Git-Tag: v3.1.0~56^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b6ab5075e881f6486145f2b3aea22bf53ee44e7;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into bg-variant

Conflicts:
	less/mixins.less
---

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