diff options
| author | Mark Otto <[email protected]> | 2015-12-07 23:28:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-12-07 23:28:31 -0800 |
| commit | d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072 (patch) | |
| tree | 94023062602a7112735c707fe375f1d4484d113f | |
| parent | 7eadfbc9b224fc43e25dacd6b22031953e03c4f7 (diff) | |
| parent | 2c7bac8f4f696537f4f22d2472f5a33ff4547d08 (diff) | |
| download | bootstrap-d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072.tar.xz bootstrap-d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072.zip | |
Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11
| -rw-r--r-- | docs/content/typography.md | 6 | ||||
| -rw-r--r-- | scss/_type.scss | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md index bc2a85c63..d8cd4b010 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -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 %} diff --git a/scss/_type.scss b/scss/_type.scss index 6759677aa..ea682812e 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -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 |