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

d3c87d32 · Mark Otto · 7eadfbc9 · 2c7bac8f · d3c87d32 · d3c87d32
Commit d3c87d32 authored 9 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 8 deletions
+8 -8
--- 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 class="list-inline-item">Lorem ipsum</li>
-  <li>Phasellus iaculis</li>
+  <li class="list-inline-item">Phasellus iaculis</li>
-  <li>Nulla volutpat</li>
+  <li class="list-inline-item">Nulla volutpat</li>
 </ul>
 {% endexample %}

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