]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
merge in #1757 and make the chance to the mustache template, then remake
authorMark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 08:07:08 +0000 (00:07 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 08:07:08 +0000 (00:07 -0800)
docs/assets/bootstrap.zip
docs/templates/pages/base-css.mustache

index 7c1f79a546fa9f2034fa1dbc8615bd6479efd264..707487f67c8afad856eeef33762d472c95e9bc08 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 1b8307b926579479fd17e4f5cf4217f51ec1a736..8fe3443a60ba75552cd97e81bb3f9aee3a6b7657 100644 (file)
           <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> {{_i}}User{{/i}}</a>
+          <a class="btn btn-primary" href="#"><i class="icon-user icon-white"></i> {{_i}}User{{/i}}</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> {{_i}}Edit{{/i}}</a></li>