Skip to content

B
bootstrap
Commit d195d598 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents 55b7b149 50674b16
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
components.html
View file @ d195d598
...@@ -248,7 +248,7 @@ base_url: "../" ...@@ -248,7 +248,7 @@ base_url: "../"
{% highlight html %} {% highlight html %}
<button type="button" class="btn btn-default btn-lg"> <button type="button" class="btn btn-default btn-lg">
<span class="glyphicon glyphicon-star"></span> Star <span class="glyphicon glyphicon-star"></span> Star
</a> </button>
{% endhighlight %} {% endhighlight %}
</div> </div>
......
less/panels.less
View file @ d195d598
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
// any kind of custom content between the two. // any kind of custom content between the two.
.panel { .panel {
> .table {
margin-bottom: 0;
}
> .list-group { > .list-group {
margin-bottom: 0; margin-bottom: 0;
......
Markdown is supported
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