Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

1 files changed, 37 insertions, 41 deletions

diff --git a/less/list-group.less b/less/list-group.less
index d812cc5f9..34718633a 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -7,7 +7,8 @@
 // Easily usable on <ul>, <ol>, or <div>.
 .list-group {
   // No need to set list-style: none; since .list-group-item is block level
-  margin: 0 0 20px; // reset all margins because ul and ol
+  margin-bottom: 20px;
+  padding-left: 0; // reset padding because ul and ol
   background-color: @list-group-bg;
 }
 
@@ -21,16 +22,22 @@
   // Place the border on the list items and negative margin up for better styling
   margin-bottom: -1px;
   border: 1px solid @list-group-border;
-}
-// Round the first and last items
-.list-group-item:first-child {
-  .border-top-radius(@border-radius-base);
-}
-.list-group-item:last-child {
-  margin-bottom: 0;
-  .border-bottom-radius(@border-radius-base);
-}
 
+  // Round the first and last items
+  &:first-child {
+    .border-top-radius(@border-radius-base);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    .border-bottom-radius(@border-radius-base);
+  }
+
+  // Align badges within list items
+  > .badge {
+    float: right;
+    margin-right: -15px;
+  }
+}
 
 // Custom content options
 // -------------------------
@@ -49,45 +56,34 @@
 
 // Custom content within linked items
 a.list-group-item {
+  // Colorize content accordingly
   .list-group-item-heading {
     color: #333;
   }
   .list-group-item-text {
     color: #555;
   }
-}
 
-// Hover state
-a.list-group-item:hover,
-a.list-group-item:focus {
-  text-decoration: none;
-  background-color: @list-group-hover-bg;
-}
-
-// Active class on item itself, not parent
-a.list-group-item.active {
-  z-index: 2; // Place active items above their siblings for proper border styling
-  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 {
-    color: inherit;
-  }
-  .list-group-item-text {
-    color: lighten(@list-group-active-bg, 40%);
+  // Hover state
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    background-color: @list-group-hover-bg;
   }
-}
 
-// Chevrons and badges within list items
-// -------------------------
+  // Active class on item itself, not parent
+  &.active {
+    z-index: 2; // Place active items above their siblings for proper border styling
+    color: @list-group-active-color;
+    background-color: @list-group-active-bg;
+    border-color: @list-group-active-border;
 
-.list-group-item > .badge,
-.list-group-item > .glyphicon-chevron-right {
-  float: right;
-  margin-right: -15px;
-}
-.list-group-item > .glyphicon + .badge {
-  margin-right: 5px;
+    // Force color to inherit for custom content
+    .list-group-item-heading {
+      color: inherit;
+    }
+    .list-group-item-text {
+      color: lighten(@list-group-active-bg, 40%);
+    }
+  }
 }