Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11
This commit is contained in:
commit
d3c87d32fa
|
@ -209,9 +209,9 @@ Place all list items on a single line with `display: inline-block;` and some lig
|
|||
|
||||
{% example html %}
|
||||
<ul class="list-inline">
|
||||
<li>Lorem ipsum</li>
|
||||
<li>Phasellus iaculis</li>
|
||||
<li>Nulla volutpat</li>
|
||||
<li class="list-inline-item">Lorem ipsum</li>
|
||||
<li class="list-inline-item">Phasellus iaculis</li>
|
||||
<li class="list-inline-item">Nulla volutpat</li>
|
||||
</ul>
|
||||
{% endexample %}
|
||||
|
||||
|
|
|
@ -93,12 +93,12 @@ mark,
|
|||
.list-inline {
|
||||
@include list-unstyled;
|
||||
margin-left: -$list-inline-padding;
|
||||
}
|
||||
|
||||
> li {
|
||||
.list-inline-item {
|
||||
display: inline-block;
|
||||
padding-right: $list-inline-padding;
|
||||
padding-left: $list-inline-padding;
|
||||
}
|
||||
}
|
||||
|
||||
// Horizontal description lists w/ grid classes
|
||||
|
|
Loading…
Reference in New Issue