From: Mark Otto <markdotto@gmail.com>
Date: Tue, 8 Dec 2015 07:28:31 +0000 (-0800)
Subject: Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen... 
X-Git-Tag: v4.0.0-alpha.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072;p=thirdparty%2Fbootstrap.git

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

d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072
diff --cc scss/_type.scss
index 6759677aa9,99f773e2a5..ea682812ea
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@@ -92,13 -100,13 +92,13 @@@ mark
  // Inline turns list items into inline-block
  .list-inline {
    @include list-unstyled;
 -  margin-left: -5px;
 +  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: 5px;
 -  padding-left: 5px;
++  padding-right: $list-inline-padding;
++  padding-left: $list-inline-padding;
  }
  
  // Horizontal description lists w/ grid classes