Merge branch 'master' into popovers-use-radii-var

Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map

2 files changed, 20 insertions, 3 deletions

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 9fd87deda2..e307471d37 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -1311,17 +1311,17 @@
   <div class="bs-customizer-input">
     <label for="input-@list-group-hover-bg">@list-group-hover-bg</label>
     <input id="input-@list-group-hover-bg" type="text" value="#f5f5f5" data-var="@list-group-hover-bg" class="form-control"/>
-    <p class="help-block">Background color of single list elements on hover</p>
+    <p class="help-block">Background color of single list items on hover</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@list-group-active-color">@list-group-active-color</label>
     <input id="input-@list-group-active-color" type="text" value="@component-active-color" data-var="@list-group-active-color" class="form-control"/>
-    <p class="help-block">Text color of active list elements</p>
+    <p class="help-block">Text color of active list items</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@list-group-active-bg">@list-group-active-bg</label>
     <input id="input-@list-group-active-bg" type="text" value="@component-active-bg" data-var="@list-group-active-bg" class="form-control"/>
-    <p class="help-block">Background color of active list elements</p>
+    <p class="help-block">Background color of active list items</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@list-group-active-border">@list-group-active-border</label>
@@ -1331,6 +1331,22 @@
   <div class="bs-customizer-input">
     <label for="input-@list-group-active-text-color">@list-group-active-text-color</label>
     <input id="input-@list-group-active-text-color" type="text" value="lighten(@list-group-active-bg, 40%)" data-var="@list-group-active-text-color" class="form-control"/>
+    <p class="help-block">Text color for content within active list items</p>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@list-group-disabled-color">@list-group-disabled-color</label>
+    <input id="input-@list-group-disabled-color" type="text" value="@gray-light" data-var="@list-group-disabled-color" class="form-control"/>
+    <p class="help-block">Text color of disabled list items</p>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@list-group-disabled-bg">@list-group-disabled-bg</label>
+    <input id="input-@list-group-disabled-bg" type="text" value="@gray-lighter" data-var="@list-group-disabled-bg" class="form-control"/>
+    <p class="help-block">Background color of disabled list items</p>
+  </div>
+  <div class="bs-customizer-input">
+    <label for="input-@list-group-disabled-text-color">@list-group-disabled-text-color</label>
+    <input id="input-@list-group-disabled-text-color" type="text" value="@list-group-disabled-color" data-var="@list-group-disabled-text-color" class="form-control"/>
+    <p class="help-block">Text color for content within disabled list items</p>
   </div>
   <div class="bs-customizer-input">
     <label for="input-@list-group-link-color">@list-group-link-color</label>
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html
index 39280938b4..f63a1335a9 100644
--- a/docs/_includes/nav-components.html
+++ b/docs/_includes/nav-components.html
@@ -123,6 +123,7 @@
     <li><a href="#list-group-basic">Basic example</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
+    <li><a href="#list-group-disabled">Disabled items</a></li>
     <li><a href="#list-group-contextual-classes">Contextual classes</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
   </ul>