From 404fab4cc39f67e7a9179023220cce0f119ea04a Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Mon, 21 Oct 2013 10:36:10 -0500
Subject: [PATCH] list badges

---
 dist/css/ionic-ios7.css   |  4 ++--
 dist/css/ionic-scoped.css |  4 ++--
 dist/css/ionic.css        |  4 ++--
 scss/ionic/_listview.scss | 12 ++----------
 test/lists.html           | 28 ++++++++++++++++++++++++++--
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css
index 305c8cb252..d3dc9f7d9d 100644
--- a/dist/css/ionic-ios7.css
+++ b/dist/css/ionic-ios7.css
@@ -978,9 +978,9 @@ address {
   background-color: white; }
   .list-item:last-child {
     margin-bottom: 0; }
-  .list-item > .badge {
+  .list-item .badge {
     float: right; }
-  .list-item > .badge + .badge {
+  .list-item .badge + .badge {
     margin-right: 5px; }
   .list-item.active, .list-item.active:hover, .list-item.active:focus {
     z-index: 2; }
diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css
index 30efd9898f..a2ddf42465 100644
--- a/dist/css/ionic-scoped.css
+++ b/dist/css/ionic-scoped.css
@@ -1689,9 +1689,9 @@
     background-color: white; }
     .ionic .list-item:last-child {
       margin-bottom: 0; }
-    .ionic .list-item > .badge {
+    .ionic .list-item .badge {
       float: right; }
-    .ionic .list-item > .badge + .badge {
+    .ionic .list-item .badge + .badge {
       margin-right: 5px; }
     .ionic .list-item.active, .ionic .list-item.active:hover, .ionic .list-item.active:focus {
       z-index: 2; }
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 8c2ad98766..07387c84b5 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2087,9 +2087,9 @@ address {
   background-color: white; }
   .list-item:last-child {
     margin-bottom: 0; }
-  .list-item > .badge {
+  .list-item .badge {
     float: right; }
-  .list-item > .badge + .badge {
+  .list-item .badge + .badge {
     margin-right: 5px; }
   .list-item.active, .list-item.active:hover, .list-item.active:focus {
     z-index: 2; }
diff --git a/scss/ionic/_listview.scss b/scss/ionic/_listview.scss
index 1ce437a552..7762b077c1 100644
--- a/scss/ionic/_listview.scss
+++ b/scss/ionic/_listview.scss
@@ -37,32 +37,24 @@
   }
 
   // Align badges within list items
-  > .badge {
+  .badge {
     float: right;
   }
 
-  > .badge + .badge {
+  .badge + .badge {
     margin-right: 5px;
   }
 
-  // [converter] extracted a& to a.list-item
-
   // Active class on item itself, not parent
   &.active,
   &.active:hover,
   &.active:focus {
     z-index: 2; 
-    //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-item-heading {
       color: inherit;
     }
-    .list-item-text {
-      //color: lighten($list-group-active-bg, 40%);
-    }
   }
 
   // Different themes for list items
diff --git a/test/lists.html b/test/lists.html
index 1d43c2d7b4..a8cd4fcd3b 100644
--- a/test/lists.html
+++ b/test/lists.html
@@ -40,7 +40,30 @@
 
           <a href="#" class="list-item">
             <div class="list-item-content slide-left">
-              Settings
+              Computers
+              <span class="badge">3</span>
+            </div>
+            <div class="list-item-buttons">
+             <button class="button">Button</button>
+           </div>
+          </a>
+
+          <a href="#" class="list-item">
+            <div class="list-item-content slide-left">
+              Monitors
+              <span class="badge">6</span>
+            </div>
+            <div class="list-item-buttons">
+             <button class="button">Button</button>
+           </div>
+          </a>
+
+          <a href="#" class="list-item">
+            <div class="list-item-content slide-left">
+              Multiple Badges
+              <span class="badge">62</span>
+              <span class="badge">4</span>
+              <span class="badge">143</span>
             </div>
             <div class="list-item-buttons">
              <button class="button">Button</button>
@@ -70,7 +93,8 @@
 
           <a href="#" class="list-item list-icon-right">
             <div class="list-item-content">
-              Settings
+              Computers
+              <span class="badge">3</span>
               <i class="icon-chevron-right"></i>
             </div>
           </a>