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

3 files changed, 28 insertions, 4 deletions

diff --git a/less/list-group.less b/less/list-group.less
index c352fa133..9e3b1ef8e 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -67,6 +67,22 @@ a.list-group-item {
 }
 
 .list-group-item {
+  // Disabled state
+  &.disabled,
+  &.disabled:hover,
+  &.disabled:focus {
+    background-color: @list-group-disabled-bg;
+    color: @list-group-disabled-color;
+
+    // Force color to inherit for custom content
+    .list-group-item-heading {
+      color: inherit;
+    }
+    .list-group-item-text {
+      color: @list-group-disabled-text-color;
+    }
+  }
+
   // Active class on item itself, not parent
   &.active,
   &.active:hover,
diff --git a/less/tables.less b/less/tables.less
index d5c0afd01..555d7924c 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -169,7 +169,7 @@ table {
 // will display normally.
 
 .table-responsive {
-  @media (max-width: @screen-xs-max) {
+  @media screen and (max-width: @screen-xs-max) {
     width: 100%;
     margin-bottom: (@line-height-computed * 0.75);
     overflow-y: hidden;
diff --git a/less/variables.less b/less/variables.less
index 8cb951740..bdc719cb3 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -643,16 +643,24 @@
 //** List group border radius
 @list-group-border-radius:      @border-radius-base;
 
-//** Background color of single list elements on hover
+//** Background color of single list items on hover
 @list-group-hover-bg:           #f5f5f5;
-//** Text color of active list elements
+//** Text color of active list items
 @list-group-active-color:       @component-active-color;
-//** Background color of active list elements
+//** Background color of active list items
 @list-group-active-bg:          @component-active-bg;
 //** Border color of active list elements
 @list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
 @list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
 
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
 @list-group-link-color:         #555;
 @list-group-link-heading-color: #333;