1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

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

This commit is contained in:
Mark Otto 2013-08-19 08:58:59 -07:00
commit d195d5989f
2 changed files with 1 additions and 4 deletions

View file

@ -248,7 +248,7 @@ base_url: "../"
{% highlight html %}
<button type="button" class="btn btn-default btn-lg">
<span class="glyphicon glyphicon-star"></span> Star
</a>
</button>
{% endhighlight %}
</div>

View file

@ -25,9 +25,6 @@
// any kind of custom content between the two.
.panel {
> .table {
margin-bottom: 0;
}
> .list-group {
margin-bottom: 0;