From: Mark Otto <markotto@twitter.com>
Date: Sat, 10 Mar 2012 22:12:29 +0000 (-0800)
Subject: Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
X-Git-Tag: v2.0.2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7d4fb61ce1c1f2acde74d779adbc91d137e157c;p=thirdparty%2Fbootstrap.git

Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip
---

f7d4fb61ce1c1f2acde74d779adbc91d137e157c
diff --cc docs/assets/bootstrap.zip
index ca6b71417a,1636eb0628..d17012d706
Binary files differ
diff --cc docs/assets/css/bootstrap.css
index 15d7c0d070,03a165545d..00baa1a5f9
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2337,11 -2434,12 +2451,12 @@@ input[type="submit"].btn.btn-small 
    margin-top: 9px;
  }
  .nav-list {
 -  padding-left: 14px;
 -  padding-right: 14px;
 +  padding-left: 15px;
 +  padding-right: 15px;
    margin-bottom: 0;
  }
- .nav-list > li > a, .nav-list .nav-header {
+ .nav-list > li > a,
+ .nav-list .nav-header {
    margin-left: -15px;
    margin-right: -15px;
    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);