mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 20:55:50 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-08-19 08:58:59 -07:00
parent 55b7b1494f 50674b16d3
commit d195d5989f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components.html
View File

@@ -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>

3
less/panels.less
View File

@@ -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;