kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11

This commit is contained in:
Mark Otto 2015-12-07 23:28:31 -08:00
parent 7eadfbc9b2 2c7bac8f4f
commit d3c87d32fa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/content/typography.md
View File

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

10
scss/_type.scss
View File

@ -93,12 +93,12 @@ mark,
.list-inline {
@include list-unstyled;
margin-left: -$list-inline-padding;
}
> li {
display: inline-block;
padding-right: $list-inline-padding;
padding-left: $list-inline-padding;
}
.list-inline-item {
display: inline-block;
padding-right: $list-inline-padding;
padding-left: $list-inline-padding;
}
// Horizontal description lists w/ grid classes