diff options
| author | Mark Otto <[email protected]> | 2013-08-19 08:58:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-19 08:58:59 -0700 |
| commit | d195d5989f2efc8cd9446db88f8c9a03c95d29e7 (patch) | |
| tree | c9d00cd6f6a157140232f61dd93a9fc79fcf3051 | |
| parent | 55b7b1494f5145082e6e13a0c3eaf61918e898cf (diff) | |
| parent | 50674b16d30d044281c8695e871452ae3fbc891c (diff) | |
| download | bootstrap-d195d5989f2efc8cd9446db88f8c9a03c95d29e7.tar.xz bootstrap-d195d5989f2efc8cd9446db88f8c9a03c95d29e7.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | components.html | 2 | ||||
| -rw-r--r-- | less/panels.less | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/components.html b/components.html index c54bae85c..9bd2b3d48 100644 --- 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> diff --git a/less/panels.less b/less/panels.less index 0f454fea0..2343b2508 100644 --- 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; |