Merge branch 'master' of https://github.com/bastula/bootstrap into bastula-master

This commit is contained in:
Mark Otto 2012-02-07 00:05:25 -08:00
commit 3fa971378e

View File

@ -1544,7 +1544,7 @@ For example, <code>section</code> should be wrapped as inline.
<a class="btn" href="#"><i class="icon-align-justify"></i></a>
</div>
<div class="btn-group">
<a class="btn btn-primary" href="#"><i class="icon white user"></i> User</a>
<a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> User</a>
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#"><i class="icon-pencil"></i> Edit</a></li>