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

Conflicts:
	docs/assets/css/docs.css

diff --cc docs/assets/css/docs.css
index 7f2526f2113d54bd3ead6fd470fcacde6fbd22ea,b08437a0eff8d87205213227a4f095eb6bf5352f..c2446d0fe4f64a917645f4d153ad0e9e3f8488d9
--- 1/docs/assets/css/docs.css
--- 2/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 {

diff --cc docs/components.html
Simple merge

diff --cc docs/css.html
Simple merge