From: Mark Otto <markdotto@gmail.com>
Date: Sun, 30 Oct 2016 20:49:46 +0000 (-0700)
Subject: Merge branch 'v4-flex-list-group' of https://github.com/rosskevin/bootstrap into... 
X-Git-Tag: v4.0.0-alpha.6~462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e11e6ec9133e8f7eb5c06829233fd12403947e55;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-flex-list-group' of https://github.com/rosskevin/bootstrap into rosskevin-v4-flex-list-group
---

e11e6ec9133e8f7eb5c06829233fd12403947e55
diff --cc scss/_list-group.scss
index f17fb9bb11,21a43eb770..ce1eee1298
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@@ -14,9 -19,15 +19,16 @@@
  // Use on `li`s or `div`s within the `.list-group` parent.
  
  .list-group-item {
+   @if $enable-flex {
+     display: flex;
+     flex-flow: row wrap;
+     align-items: center;
+   } @else {
+     display: block;
+   }
++  
    position: relative;
-   display: block;
 -  padding: .75rem 1.25rem;
 +  padding: $list-group-item-padding-y $list-group-item-padding-x;
    // Place the border on the list items and negative margin up for better styling
    margin-bottom: -$list-group-border-width;
    background-color: $list-group-bg;