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

d195d598 · Mark Otto · 55b7b149 · 50674b16 · d195d598 · d195d598
Commit d195d598 authored 11 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 4 deletions
+1 -4
--- a/components.html
+++ b/components.html
@@ -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>

--- a/less/panels.less
+++ b/less/panels.less
@@ -25,9 +25,6 @@
 // any kind of custom content between the two.

 .panel {
-  > .table {
-    margin-bottom: 0;
-  }
  > .list-group {
    margin-bottom: 0;