From: Mark Otto <markdotto@gmail.com>
Date: Thu, 30 Jun 2011 00:11:02 +0000 (-0700)
Subject: Merge branch 'master' of http://git.local.twitter.com/bootstrap
X-Git-Tag: v1.0.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cddc565d07fed42576a55111ea60ce1b6ff5bbd9;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of http://git.local.twitter.com/bootstrap
---

cddc565d07fed42576a55111ea60ce1b6ff5bbd9
diff --cc bootstrap-1.0.0.css
index b8755a33d4,e33fef2bd3..abd31f47a5
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@@ -429,10 -413,8 +413,8 @@@ p 
  }
  p small {
    font-size: 12px;
 -  color: #b3b3b3;
 +  color: #bfbfbf;
  }
- /* Headings
- -------------------------------------------------- */
  h1,
  h2,
  h3,
@@@ -488,11 -470,9 +470,9 @@@ h5 
  }
  h6 {
    font-size: 13px;
 -  color: #b3b3b3;
 +  color: #bfbfbf;
    text-transform: uppercase;
  }
- /* Colors
- -------------------------------------------------- */
  ul, ol {
    margin: 0 0 18px 25px;
  }
diff --cc lib/type.less
index 22eb477800,e19c51ab91..cc18bff602
--- a/lib/type.less
+++ b/lib/type.less
@@@ -16,12 -15,11 +15,11 @@@ p 
    }
  }
  
- 
- /* Headings
- -------------------------------------------------- */
+ // Headings
+ // --------
  
  h1, h2, h3, h4, h5, h6 {
 -  font-weight: 500;
 +  font-weight: bold;
    color: @grayDark;
    small {
      color: @grayLight;