Commit 7c94f5ef authored by Mark Otto's avatar Mark Otto

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

parents 751eb0bd 217ac7b7
...@@ -63,7 +63,7 @@ title: Jumbotron template ...@@ -63,7 +63,7 @@ title: Jumbotron template
</ul> </ul>
</li> </li>
</ul> </ul>
<form class="navbar-form pull-right"> <form class="navbar-form form-inline pull-right">
<input type="text" placeholder="Email"> <input type="text" placeholder="Email">
<input type="password" placeholder="Password"> <input type="password" placeholder="Password">
<button type="submit" class="btn">Sign in</button> <button type="submit" class="btn">Sign in</button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment