From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Mon, 16 Jan 2017 05:36:15 +0000 (-0500)
Subject: Remove list-group-item-heading and list-group-item-text (#21653)
X-Git-Tag: v4.0.0-beta~147^2~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a5439a8cc7cb3f916efb36bf785bdbd836858d;p=thirdparty%2Fbootstrap.git

Remove list-group-item-heading and list-group-item-text (#21653)
---

diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index ec813c807e..bb8a8d1031 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -22,10 +22,6 @@
   color: $list-group-link-color;
   text-align: inherit; // For `<button>`s (anchors inherit)
 
-  .list-group-item-heading {
-    color: $list-group-link-heading-color;
-  }
-
   // Hover state
   @include hover-focus {
     color: $list-group-link-hover-color;
@@ -73,14 +69,6 @@
     color: $list-group-disabled-color;
     cursor: $cursor-disabled;
     background-color: $list-group-disabled-bg;
-
-    // Force color to inherit for custom content
-    .list-group-item-heading {
-      color: inherit;
-    }
-    .list-group-item-text {
-      color: $list-group-disabled-text-color;
-    }
   }
 
   // Include both here for `<a>`s and `<button>`s
@@ -89,17 +77,6 @@
     color: $list-group-active-color;
     background-color: $list-group-active-bg;
     border-color: $list-group-active-border;
-
-    // Force color to inherit for custom content
-    .list-group-item-heading,
-    .list-group-item-heading > small,
-    .list-group-item-heading > .small {
-      color: inherit;
-    }
-
-    .list-group-item-text {
-      color: $list-group-active-text-color;
-    }
   }
 }
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 0f4c56f93b..7a27f1e3b8 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -852,14 +852,11 @@ $list-group-hover-bg:            $gray-lightest !default;
 $list-group-active-color:        $component-active-color !default;
 $list-group-active-bg:           $component-active-bg !default;
 $list-group-active-border:       $list-group-active-bg !default;
-$list-group-active-text-color:   lighten($list-group-active-bg, 50%) !default;
 
 $list-group-disabled-color:      $gray-light !default;
 $list-group-disabled-bg:         $list-group-bg !default;
-$list-group-disabled-text-color: $list-group-disabled-color !default;
 
 $list-group-link-color:          $gray !default;
-$list-group-link-heading-color:  $gray-dark !default;
 $list-group-link-hover-color:    $list-group-link-color !default;
 
 $list-group-link-active-color:   $list-group-color !default;
diff --git a/scss/mixins/_list-group.scss b/scss/mixins/_list-group.scss
index 3db5b096a4..278787bbed 100644
--- a/scss/mixins/_list-group.scss
+++ b/scss/mixins/_list-group.scss
@@ -10,10 +10,6 @@
   button.list-group-item-#{$state} {
     color: $color;
 
-    .list-group-item-heading {
-      color: inherit;
-    }
-
     @include hover-focus {
       color: $color;
       background-color: darken($background, 5%);