From: Mark Otto <markdotto@gmail.com>
Date: Tue, 8 Dec 2015 07:31:02 +0000 (-0800)
Subject: rewrite list-inline to use margin and simpler styles
X-Git-Tag: v4.0.0-alpha.2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=515ff1aacb6f4581f3fe4193040f6ce36a2967fa;p=thirdparty%2Fbootstrap.git

rewrite list-inline to use margin and simpler styles
---

diff --git a/docs/content/typography.md b/docs/content/typography.md
index d8cd4b010b..846852a95a 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -205,7 +205,7 @@ Remove the default `list-style` and left margin on list items (immediate childre
 
 ### Inline
 
-Place all list items on a single line with `display: inline-block;` and some light padding.
+Place all list items on a single line with `display: inline-block;` and some basic margin between.
 
 {% example html %}
 <ul class="list-inline">
diff --git a/scss/_type.scss b/scss/_type.scss
index ea682812ea..35780d39e9 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -92,13 +92,13 @@ mark,
 // Inline turns list items into inline-block
 .list-inline {
   @include list-unstyled;
-  margin-left: -$list-inline-padding;
 }
-
 .list-inline-item {
   display: inline-block;
-  padding-right: $list-inline-padding;
-  padding-left: $list-inline-padding;
+
+  &:not(:last-child) {
+    margin-right: $list-inline-padding;
+  }
 }
 
 // Horizontal description lists w/ grid classes