Skip to content
GitLab
Commit 3fa97137 authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 7dffeb47 8a8daca7
2 merge requests!1882[2.0.1-wip] black/dark button ,!1894[2.0.1 wip] -- fixing Issue #1893 - removing hardcoded color border from <hr/>
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
docs/base-css.html
+ 1
- 1
View file @ 3fa97137
......@@ -1544,7 +1544,7 @@ For example, &lt;code&gt;section&lt;/code&gt; 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>
......
Supports Markdown
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