mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
This commit is contained in:
commit
d195d5989f
@ -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>
|
||||
|
@ -25,9 +25,6 @@
|
||||
// any kind of custom content between the two.
|
||||
|
||||
.panel {
|
||||
> .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
> .list-group {
|
||||
margin-bottom: 0;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user