From: Mark Otto <otto@github.com>
Date: Mon, 1 Apr 2013 01:39:49 +0000 (-0700)
Subject: Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e59357bc56b57d1482847bff0706c12efb0039c;p=thirdparty%2Fbootstrap.git

Merge branch 'SBoudrias-patch-1' into 3.0.0-wip

Conflicts:
	less/type.less
---

8e59357bc56b57d1482847bff0706c12efb0039c
diff --cc less/type.less
index 54f18d1377,54f5778c4b..5305a0df69
--- a/less/type.less
+++ b/less/type.less
@@@ -52,12 -56,12 +52,11 @@@ a.text-success:focus { color: darken(@s
  // Headings
  // -------------------------
  
 -h1, h2, h3, h4, h5, h6 {
 -  margin: (@baseLineHeight / 2) 0;
 -  font-family: @headingsFontFamily;
 -  font-weight: @headingsFontWeight;
 -  line-height: @baseLineHeight;
 -  color: @headingsColor;
 +h1, h2, h3, h4, h5, h6,
 +.h1, .h2, .h3, .h4, .h5, .h6 {
 +  font-family: @headings-font-family;
 +  font-weight: @headings-font-weight;
 +  line-height: @line-height-base;
-   text-rendering: optimizelegibility; // Fix the character spacing for headings
    small {
      font-weight: normal;
      line-height: 1;