From: Mark Otto <otto@github.com>
Date: Wed, 15 May 2013 06:28:09 +0000 (-0700)
Subject: Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
X-Git-Tag: v3.0.0-rc1~357^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31dcb911893c1f7b6eebe097705a3e64568c8654;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/assets/css/docs.css
---

31dcb911893c1f7b6eebe097705a3e64568c8654
diff --cc docs/assets/css/docs.css
index 7f2526f211,b08437a0ef..c2446d0fe4
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -294,10 -288,10 +294,15 @@@ body 
    margin: 0;
  }
  
 -.bs-example.form-inline input:not([type=checkbox]):not([type=radio]),
 -.bs-example.form-inline select {
 +/* Forms */
++.bs-example.form-inline select,
++.bs-example.form-inline input[type="text"],
++.bs-example.form-inline input[type="password"] {
+   width: 180px;
+ }
 +.bs-example-control-sizing input[type="text"] + input[type="text"] {
 +  margin-top: 10px;
 +}
  
  /* List groups */
  .bs-example > .list-group {