From: Mark Otto <markdotto@gmail.com>
Date: Sun, 26 Apr 2015 07:08:40 +0000 (-0700)
Subject: remove another extend
X-Git-Tag: v4.0.0-alpha~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=219c4cbf8708af0af79697bc0c6da36c4005ab7a;p=thirdparty%2Fbootstrap.git

remove another extend
---

diff --git a/scss/_type.scss b/scss/_type.scss
index 2818dad566..8f353df702 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -97,8 +97,9 @@ mark,
 
 // Inline turns list items into inline-block
 .list-inline {
-  @extend .list-unstyled;
+  padding-left: 0;
   margin-left: -5px;
+  list-style: none;
 
   > li {
     display: inline-block;