From c6b15d63fe8ad182f6b50796ceecc426e7fa7c33 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 15:42:59 -0500
Subject: [PATCH 01/12] refactor(item-groups): updated item groups demo to
 latest code

---
 .../item/test/groups/component-list.html          | 10 ++++++----
 ionic/components/item/test/groups/index.ts        | 15 +++++++--------
 ionic/components/item/test/groups/main.html       |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ionic/components/item/test/groups/component-list.html b/ionic/components/item/test/groups/component-list.html
index 4fb57d1032..a7462260d8 100644
--- a/ionic/components/item/test/groups/component-list.html
+++ b/ionic/components/item/test/groups/component-list.html
@@ -4,10 +4,12 @@
       {{data.day}} - Sessions
     </ion-item-group-title>
     <ion-item-sliding *ng-for="#session of data.sessions">
-      <h3>{{session.name}}</h3>
-      <p>
-        <span>{{session.location}}</span>
-      </p>
+      <button ion-item>
+        <h3>{{session.name}}</h3>
+        <p>
+          <span>{{session.location}}</span>
+        </p>
+      </button>
       <ion-item-options>
         <button primary>Speaker Info</button>
         <button secondary>Add to <br>Favorites</button>
diff --git a/ionic/components/item/test/groups/index.ts b/ionic/components/item/test/groups/index.ts
index a9c7305aea..0be5ab9165 100644
--- a/ionic/components/item/test/groups/index.ts
+++ b/ionic/components/item/test/groups/index.ts
@@ -1,21 +1,20 @@
-import {ElementRef, Host} from 'angular2/angular2';
-import {Component, View, NgIf, NgFor} from 'angular2/angular2';
-import {App, Content, Icon, Item, ItemGroup, ItemGroupTitle, ItemSliding, List, ListHeader, NavController} from 'ionic/ionic';
+import {Component, NgIf, NgFor} from 'angular2/angular2';
+import {App, Icon, Item, ItemGroup, ItemGroupTitle, ItemSliding, List, ListHeader, NavController} from 'ionic/ionic';
 
 @Component({
   properties: ['data'],
   selector: 'component-list',
-  directives: [ComponentList, Item, ItemGroup, ItemGroupTitle, ItemSliding, List, NgIf, NgFor],
+  directives: [Item, ItemGroup, ItemGroupTitle, ItemSliding, List, NgIf, NgFor],
   templateUrl: 'component-list.html'
 })
-class ComponentList {
-  constructor(elementRef: ElementRef, @Host() content:Content) {
-    console.log('Component List init', content);
+export class ComponentList {
+  constructor() {
+
   }
 }
 
 @App({
-  directives: [Content, ComponentList, Item, ItemGroup, ItemGroupTitle, ItemSliding, List, NgIf, NgFor],
+  directives: [ComponentList],
   templateUrl: 'main.html'
 })
 class E2EApp {
diff --git a/ionic/components/item/test/groups/main.html b/ionic/components/item/test/groups/main.html
index fb598a56a6..db54c5f87a 100644
--- a/ionic/components/item/test/groups/main.html
+++ b/ionic/components/item/test/groups/main.html
@@ -1,4 +1,4 @@
+<ion-toolbar><ion-title>Item Groups</ion-title></ion-toolbar>
 <ion-content class="outer-content content-selected">
-  <h4>Component List</h4>
   <component-list [data]="data"></component-list>
 </ion-content>

From 83164132e4686dd8b7d73f6805df1d524d5e6065 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 15:43:35 -0500
Subject: [PATCH 02/12] refactor(item-buttons): moved items outside of list in
 the buttons example

references #387
---
 ionic/components/item/test/buttons/main.html | 152 +++++++++----------
 1 file changed, 74 insertions(+), 78 deletions(-)

diff --git a/ionic/components/item/test/buttons/main.html b/ionic/components/item/test/buttons/main.html
index cb176c17a8..e11cb28a7a 100644
--- a/ionic/components/item/test/buttons/main.html
+++ b/ionic/components/item/test/buttons/main.html
@@ -1,91 +1,87 @@
 <ion-toolbar><ion-title>Items as Links/Buttons</ion-title></ion-toolbar>
 
-<ion-list>
+<a ion-item href="#" (click)="testClick($event)">
+  a[ion-item]
+</a>
 
-  <a ion-item href="#" (click)="testClick($event)">
-    a[ion-item]
-  </a>
+<a ion-item class="activated" href="#" (click)="testClick($event)">
+  a[ion-item].activated
+</a>
 
-  <a ion-item class="activated" href="#" (click)="testClick($event)">
-    a[ion-item].activated
-  </a>
+<button ion-item (click)="testClick($event)">
+  button[ion-item]
+</button>
 
-  <button ion-item (click)="testClick($event)">
-    button[ion-item]
+<button ion-item class="activated" (click)="testClick($event)">
+  button[ion-item].activated
+</button>
+
+<ion-item>
+  <button item-left (click)="testClick($event)">Default</button>
+  Inner Buttons
+  <button outline item-right (click)="testClick($event)">Outline</button>
+</ion-item>
+
+<ion-item>
+  <button item-left (click)="testClick($event)">
+    <icon home></icon>
+    Left Icon
   </button>
-
-  <button ion-item class="activated" (click)="testClick($event)">
-    button[ion-item].activated
+  left icon buttons
+  <button outline item-right (click)="testClick($event)">
+    <icon star></icon>
+    Left Icon
   </button>
+</ion-item>
 
-  <ion-item>
-    <button item-left (click)="testClick($event)">Default</button>
-    Inner Buttons
-    <button outline item-right (click)="testClick($event)">Outline</button>
-  </ion-item>
+<ion-item>
+  <button item-left (click)="testClick($event)">
+    Right Icon
+    <icon home></icon>
+  </button>
+  right icon buttons
+  <button outline item-right (click)="testClick($event)">
+    Right Icon
+    <icon star></icon>
+  </button>
+</ion-item>
 
-  <ion-item>
-    <button item-left (click)="testClick($event)">
-      <icon home></icon>
-      Left Icon
-    </button>
-    left icon buttons
-    <button outline item-right (click)="testClick($event)">
-      <icon star></icon>
-      Left Icon
-    </button>
-  </ion-item>
+<ion-item>
+  <button clear item-left (click)="testClick($event)">
+    <icon navigate></icon>
+  </button>
+  icon only buttons
+  <button clear item-right (click)="testClick($event)">
+    <icon navigate></icon>
+  </button>
+</ion-item>
 
-  <ion-item>
-    <button item-left (click)="testClick($event)">
-      Right Icon
-      <icon home></icon>
-    </button>
-    right icon buttons
-    <button outline item-right (click)="testClick($event)">
-      Right Icon
-      <icon star></icon>
-    </button>
-  </ion-item>
+<ion-item>
+  ion-item right icon/text button
+  <button item-right (click)="testClick($event)">
+    <icon refresh></icon>
+    Refresh
+  </button>
+</ion-item>
 
-  <ion-item>
-    <button clear item-left (click)="testClick($event)">
-      <icon navigate></icon>
-    </button>
-    icon only buttons
-    <button clear item-right (click)="testClick($event)">
-      <icon navigate></icon>
-    </button>
-  </ion-item>
+<ion-item>
+  <button clear item-left (click)="testClick($event)">
+    <icon settings></icon>
+    Settings
+  </button>
+  ion-item left clear button
+</ion-item>
 
-  <ion-item>
-    ion-item right icon/text button
-    <button item-right (click)="testClick($event)">
-      <icon refresh></icon>
-      Refresh
-    </button>
-  </ion-item>
+<ion-item>
+  ion-item right clear button
+  <button secondary clear item-right (click)="testClick($event)">
+    Edit
+  </button>
+</ion-item>
 
-  <ion-item>
-    <button clear item-left (click)="testClick($event)">
-      <icon settings></icon>
-      Settings
-    </button>
-    ion-item left clear button
-  </ion-item>
-
-  <ion-item>
-    ion-item right clear button
-    <button secondary clear item-right (click)="testClick($event)">
-      Edit
-    </button>
-  </ion-item>
-
-  <ion-item text-wrap>
-    This is multiline text that has a
-    long description of about how the text is really long
-    and a <a href="#" (click)="testClick($event)">link</a>.
-    <button outline item-right (click)="testClick($event)">View</button>
-  </ion-item>
-
-</ion-list>
+<ion-item text-wrap>
+  This is multiline text that has a
+  long description of about how the text is really long
+  and a <a href="#" (click)="testClick($event)">link</a>.
+  <button outline item-right (click)="testClick($event)">View</button>
+</ion-item>

From 85bd3fbfec5920427f0fca01206b7d0c868b541f Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 15:49:07 -0500
Subject: [PATCH 03/12] refactor(item): removed list from item tests that don't
 need it

references #387
---
 ionic/components/item/test/buttons/main.html | 152 ++++++++++---------
 ionic/components/item/test/icons/main.html   |   4 +-
 ionic/components/item/test/images/main.html  |   4 +-
 ionic/components/item/test/media/main.html   |  10 +-
 ionic/components/item/test/text/main.html    |  90 ++++++-----
 5 files changed, 127 insertions(+), 133 deletions(-)

diff --git a/ionic/components/item/test/buttons/main.html b/ionic/components/item/test/buttons/main.html
index e11cb28a7a..459d935d1c 100644
--- a/ionic/components/item/test/buttons/main.html
+++ b/ionic/components/item/test/buttons/main.html
@@ -1,87 +1,91 @@
 <ion-toolbar><ion-title>Items as Links/Buttons</ion-title></ion-toolbar>
 
-<a ion-item href="#" (click)="testClick($event)">
-  a[ion-item]
-</a>
+<ion-content>
 
-<a ion-item class="activated" href="#" (click)="testClick($event)">
-  a[ion-item].activated
-</a>
+  <a ion-item href="#" (click)="testClick($event)">
+    a[ion-item]
+  </a>
 
-<button ion-item (click)="testClick($event)">
-  button[ion-item]
-</button>
+  <a ion-item class="activated" href="#" (click)="testClick($event)">
+    a[ion-item].activated
+  </a>
 
-<button ion-item class="activated" (click)="testClick($event)">
-  button[ion-item].activated
-</button>
-
-<ion-item>
-  <button item-left (click)="testClick($event)">Default</button>
-  Inner Buttons
-  <button outline item-right (click)="testClick($event)">Outline</button>
-</ion-item>
-
-<ion-item>
-  <button item-left (click)="testClick($event)">
-    <icon home></icon>
-    Left Icon
+  <button ion-item (click)="testClick($event)">
+    button[ion-item]
   </button>
-  left icon buttons
-  <button outline item-right (click)="testClick($event)">
-    <icon star></icon>
-    Left Icon
-  </button>
-</ion-item>
 
-<ion-item>
-  <button item-left (click)="testClick($event)">
-    Right Icon
-    <icon home></icon>
+  <button ion-item class="activated" (click)="testClick($event)">
+    button[ion-item].activated
   </button>
-  right icon buttons
-  <button outline item-right (click)="testClick($event)">
-    Right Icon
-    <icon star></icon>
-  </button>
-</ion-item>
 
-<ion-item>
-  <button clear item-left (click)="testClick($event)">
-    <icon navigate></icon>
-  </button>
-  icon only buttons
-  <button clear item-right (click)="testClick($event)">
-    <icon navigate></icon>
-  </button>
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">Default</button>
+    Inner Buttons
+    <button outline item-right (click)="testClick($event)">Outline</button>
+  </ion-item>
 
-<ion-item>
-  ion-item right icon/text button
-  <button item-right (click)="testClick($event)">
-    <icon refresh></icon>
-    Refresh
-  </button>
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">
+      <icon home></icon>
+      Left Icon
+    </button>
+    left icon buttons
+    <button outline item-right (click)="testClick($event)">
+      <icon star></icon>
+      Left Icon
+    </button>
+  </ion-item>
 
-<ion-item>
-  <button clear item-left (click)="testClick($event)">
-    <icon settings></icon>
-    Settings
-  </button>
-  ion-item left clear button
-</ion-item>
+  <ion-item>
+    <button item-left (click)="testClick($event)">
+      Right Icon
+      <icon home></icon>
+    </button>
+    right icon buttons
+    <button outline item-right (click)="testClick($event)">
+      Right Icon
+      <icon star></icon>
+    </button>
+  </ion-item>
 
-<ion-item>
-  ion-item right clear button
-  <button secondary clear item-right (click)="testClick($event)">
-    Edit
-  </button>
-</ion-item>
+  <ion-item>
+    <button clear item-left (click)="testClick($event)">
+      <icon navigate></icon>
+    </button>
+    icon only buttons
+    <button clear item-right (click)="testClick($event)">
+      <icon navigate></icon>
+    </button>
+  </ion-item>
 
-<ion-item text-wrap>
-  This is multiline text that has a
-  long description of about how the text is really long
-  and a <a href="#" (click)="testClick($event)">link</a>.
-  <button outline item-right (click)="testClick($event)">View</button>
-</ion-item>
+  <ion-item>
+    ion-item right icon/text button
+    <button item-right (click)="testClick($event)">
+      <icon refresh></icon>
+      Refresh
+    </button>
+  </ion-item>
+
+  <ion-item>
+    <button clear item-left (click)="testClick($event)">
+      <icon settings></icon>
+      Settings
+    </button>
+    ion-item left clear button
+  </ion-item>
+
+  <ion-item>
+    ion-item right clear button
+    <button secondary clear item-right (click)="testClick($event)">
+      Edit
+    </button>
+  </ion-item>
+
+  <ion-item text-wrap>
+    This is multiline text that has a
+    long description of about how the text is really long
+    and a <a href="#" (click)="testClick($event)">link</a>.
+    <button outline item-right (click)="testClick($event)">View</button>
+  </ion-item>
+  
+</ion-content>
diff --git a/ionic/components/item/test/icons/main.html b/ionic/components/item/test/icons/main.html
index e23e172f74..e98b67a447 100644
--- a/ionic/components/item/test/icons/main.html
+++ b/ionic/components/item/test/icons/main.html
@@ -1,6 +1,6 @@
 <ion-toolbar><ion-title>Item Icons</ion-title></ion-toolbar>
 
-<ion-list>
+<ion-content>
 
   <ion-item detail-push>
     ion-item [detail-push] attr
@@ -67,4 +67,4 @@
     <item-badge item-right>99</item-badge>
   </ion-item>
 
-</ion-list>
+</ion-content>
diff --git a/ionic/components/item/test/images/main.html b/ionic/components/item/test/images/main.html
index 615d71962a..53fa230b4b 100644
--- a/ionic/components/item/test/images/main.html
+++ b/ionic/components/item/test/images/main.html
@@ -1,6 +1,6 @@
 <ion-toolbar><ion-title>Item Images</ion-title></ion-toolbar>
 
-<ion-list>
+<ion-content>
 
   <ion-item>
     Plain Ol' div w/ some text, no images
@@ -58,7 +58,7 @@
     <p>Paragraph text.</p>
   </ion-item>
 
-</ion-list>
+</ion-content>
 
 <style>
   img {
diff --git a/ionic/components/item/test/media/main.html b/ionic/components/item/test/media/main.html
index b3e4dc3923..9ff54689b5 100644
--- a/ionic/components/item/test/media/main.html
+++ b/ionic/components/item/test/media/main.html
@@ -1,12 +1,6 @@
 <ion-toolbar><ion-title>Item Media</ion-title></ion-toolbar>
 
-<!--
-  class="line-media"
-  class="line-none"
-  class="line-full"
--->
-
-<ion-list>
+<ion-content>
 
   <button ion-item>
     <ion-avatar item-left>
@@ -65,7 +59,7 @@
     <icon close-circle item-right></icon>
   </button>
 
-</ion-list>
+</ion-content>
 
 <style>
   img {
diff --git a/ionic/components/item/test/text/main.html b/ionic/components/item/test/text/main.html
index 202a8ee16a..743497bd21 100644
--- a/ionic/components/item/test/text/main.html
+++ b/ionic/components/item/test/text/main.html
@@ -2,60 +2,56 @@
 
 <ion-content class="outer-content">
 
-  <ion-list>
+  <ion-item>
+    Plain Ol' div with some text
+  </ion-item>
 
-    <ion-item>
-      Plain Ol' div with some text
-    </ion-item>
+  <ion-item>
+    Single line text that should have ellipses when it doesn't all fit in the item
+  </ion-item>
 
-    <ion-item>
-      Single line text that should have ellipses when it doesn't all fit in the item
-    </ion-item>
+  <ion-item no-lines>
+    Single line item with no lines
+  </ion-item>
 
-    <ion-item no-lines>
-      Single line item with no lines
-    </ion-item>
+  <ion-item text-wrap>
+    Multiline text that should wrap when it is too long
+    to fit on one line in the item. Attribute on .item
+  </ion-item>
 
-    <ion-item text-wrap>
-      Multiline text that should wrap when it is too long
-      to fit on one line in the item. Attribute on .item
-    </ion-item>
+  <ion-item text-wrap>
+    <h1>H1 Title Text</h1>
+    <p>Paragraph line 1</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h1>H1 Title Text</h1>
-      <p>Paragraph line 1</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h2>H2 Title Text</h2>
+    <p>Paragraph line 1</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h2>H2 Title Text</h2>
-      <p>Paragraph line 1</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h3>H3 Title Text</h3>
+    <p>Paragraph line 1</p>
+    <p>Paragraph line 2</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h3>H3 Title Text</h3>
-      <p>Paragraph line 1</p>
-      <p>Paragraph line 2</p>
-    </ion-item>
+  <ion-item text-wrap>
+    <h4>H4 Title Text</h4>
+    <p>Paragraph line 1</p>
+    <p>Paragraph line 2</p>
+    <p>Paragraph line 3</p>
+  </ion-item>
 
-    <ion-item text-wrap>
-      <h4>H4 Title Text</h4>
-      <p>Paragraph line 1</p>
-      <p>Paragraph line 2</p>
-      <p>Paragraph line 3</p>
-    </ion-item>
-
-    <ion-item>
-      <ion-item-content>
-        Column 1
-      </ion-item-content>
-      <ion-item-content>
-        Column 2
-      </ion-item-content>
-      <ion-item-content>
-        Column 3
-      </ion-item-content>
-    </ion-item>
-
-  </ion-list>
+  <ion-item>
+    <ion-item-content>
+      Column 1
+    </ion-item-content>
+    <ion-item-content>
+      Column 2
+    </ion-item-content>
+    <ion-item-content>
+      Column 3
+    </ion-item-content>
+  </ion-item>
 
 </ion-content>

From 503abf5225c6926c7e2e80e876cd87b521071c91 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 15:51:01 -0500
Subject: [PATCH 04/12] refactor(item): moved iOS styling from the list file to
 the item file

references #387
---
 ionic/components/item/item.scss      |   2 +-
 ionic/components/item/modes/ios.scss | 108 +++++++++++++++++++++++++-
 ionic/components/list/modes/ios.scss | 112 +--------------------------
 3 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss
index 9ce65209c1..ad2822a028 100644
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@@ -55,7 +55,7 @@
 }
 
 a.item,
-button.item.item {
+button.item {
   margin: 0;
   padding: 0;
   width: 100%;
diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss
index c8a78d40c9..6913705139 100644
--- a/ionic/components/item/modes/ios.scss
+++ b/ionic/components/item/modes/ios.scss
@@ -29,7 +29,6 @@ $item-ios-divider-padding:            5px 15px !default;
 $item-ios-sliding-content-bg:         $background-color !default;
 $item-ios-sliding-transition:         transform 250ms ease-in-out !default;
 
-
 .item-group-title {
   padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left;
   background-color: $item-ios-divider-bg;
@@ -52,6 +51,12 @@ ion-note {
   }
 }
 
+.item {
+  border-radius: 0;
+  padding-left: $item-ios-padding-left;
+  font-size: $item-ios-font-size;
+}
+
 .item.activated,
 a.item.activated,
 button.item.activated {
@@ -64,3 +69,104 @@ a.item,
 button.item {
   transition-duration: 200ms;
 }
+
+.item-inner {
+  padding-right: ($item-ios-padding-right / 2);
+  border-bottom: 1px solid $item-ios-border-color;
+}
+
+ion-item-content {
+  margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
+}
+
+// TODO clean up Sass variables
+[item-left] {
+  margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) 0;
+}
+
+[item-right] {
+  margin: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2);
+}
+
+icon[item-left],
+icon[item-right] {
+  margin-top: $item-ios-padding-icon-top;
+  margin-bottom: $item-ios-padding-icon-bottom;
+}
+
+ion-avatar[item-left],
+ion-thumbnail[item-left] {
+  margin: ($item-ios-padding-right / 2) $item-ios-padding-right ($item-ios-padding-right / 2) 0;
+}
+
+ion-avatar[item-right],
+ion-thumbnail[item-right] {
+  margin: ($item-ios-padding-right / 2);
+}
+
+button[item-left],
+button[item-right],
+[button][item-left],
+[button][item-right] {
+  padding: 0 0.5em;
+  font-size: 1.3rem;
+  min-height: 25px;
+  margin-top: 9px;
+}
+
+[item-left].icon-only,
+[item-right].icon-only,
+[item-left].icon-only icon,
+[item-right].icon-only icon,
+[item-left][clear],
+[item-right][clear] {
+  padding: 0 1px;
+}
+
+[item-left].icon-left icon,
+[item-right].icon-left icon {
+  margin-left: 0;
+  margin-bottom: 1px;
+  padding-right: 0.3em;
+}
+
+[item-left].icon-right icon,
+[item-right].icon-right icon {
+  margin-right: 0;
+  margin-bottom: 1px;
+}
+
+ion-avatar {
+  min-width: $item-ios-avatar-size;
+  min-height: $item-ios-avatar-size;
+
+  img {
+    max-width: $item-ios-avatar-size;
+    max-height: $item-ios-avatar-size;
+    border-radius: $item-ios-avatar-size / 2;
+  }
+}
+
+ion-thumbnail {
+  min-width: $item-ios-thumbnail-size;
+  min-height: $item-ios-thumbnail-size;
+
+  img {
+    max-width: $item-ios-thumbnail-size;
+    max-height: $item-ios-thumbnail-size;
+  }
+}
+
+button.item:not([detail-none]) .item-inner,
+a.item:not([detail-none]) .item-inner,
+.item[detail-push] .item-inner {
+  @include ios-detail-push-icon($item-ios-detail-push-color);
+  background-repeat: no-repeat;
+  background-position: right ($item-ios-padding-right - 2) center;
+  background-size: 14px 14px;
+  padding-right: 32px;
+}
+
+&.hairlines .item-inner {
+  border-bottom-width: 0.55px;
+}
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index fde73e9679..6016fedefe 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -38,17 +38,10 @@ $list-ios-header-color:               #333 !default;
   }
 
   ion-header,
-  ion-item-group-title , {
+  ion-item-group-title {
     border-bottom: 1px solid $item-ios-border-color;
   }
 
-  .item {
-    border-radius: 0;
-    // TODO this makes the border not show on sticky
-    padding-left: $item-ios-padding-left;
-    font-size: $item-ios-font-size;
-  }
-
   > .item:first-child {
     border-top: 1px solid $item-ios-border-color;
   }
@@ -62,16 +55,8 @@ $list-ios-header-color:               #333 !default;
     }
   }
 
-  .item {
-
-    .item-inner {
-      padding-right: ($item-ios-padding-right / 2);
-      border-bottom: 1px solid $item-ios-border-color;
-    }
-
-    ion-item-content {
-      margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
-    }
+  .item-inner {
+    border-bottom: 1px solid $item-ios-border-color;
   }
 
   // If the item has the no-lines attribute remove the bottom border from:
@@ -82,84 +67,6 @@ $list-ios-header-color:               #333 !default;
     border-width: 0;
   }
 
-  [item-left] {
-    margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) 0;
-  }
-
-  [item-right] {
-    margin: ($item-ios-padding-top / 2) ($item-ios-padding-right / 2) ($item-ios-padding-bottom / 2) ($item-ios-padding-left / 2);
-  }
-
-  // TODO clean up Sass variables
-  icon[item-left],
-  icon[item-right] {
-    margin-top: $item-ios-padding-icon-top;
-    margin-bottom: $item-ios-padding-icon-bottom;
-  }
-
-  ion-avatar[item-left],
-  ion-thumbnail[item-left] {
-    margin: ($item-ios-padding-right / 2) $item-ios-padding-right ($item-ios-padding-right / 2) 0;
-  }
-
-  ion-avatar[item-right],
-  ion-thumbnail[item-right] {
-    margin: ($item-ios-padding-right / 2);
-  }
-
-  button[item-left],
-  button[item-right],
-  [button][item-left],
-  [button][item-right] {
-    padding: 0 0.5em;
-    font-size: 1.3rem;
-    min-height: 25px;
-    margin-top: 9px;
-  }
-
-  [item-left].icon-only,
-  [item-right].icon-only,
-  [item-left].icon-only icon,
-  [item-right].icon-only icon,
-  [item-left][clear],
-  [item-right][clear] {
-    padding: 0 1px;
-  }
-
-  [item-left].icon-left icon,
-  [item-right].icon-left icon {
-    margin-left: 0;
-    margin-bottom: 1px;
-    padding-right: 0.3em;
-  }
-
-  [item-left].icon-right icon,
-  [item-right].icon-right icon {
-    margin-right: 0;
-    margin-bottom: 1px;
-  }
-
-  ion-avatar {
-    min-width: $item-ios-avatar-size;
-    min-height: $item-ios-avatar-size;
-
-    img {
-      max-width: $item-ios-avatar-size;
-      max-height: $item-ios-avatar-size;
-      border-radius: $item-ios-avatar-size / 2;
-    }
-  }
-
-  ion-thumbnail {
-    min-width: $item-ios-thumbnail-size;
-    min-height: $item-ios-thumbnail-size;
-
-    img {
-      max-width: $item-ios-thumbnail-size;
-      max-height: $item-ios-thumbnail-size;
-    }
-  }
-
   ion-item-options {
     border-bottom: 1px solid $item-ios-border-color;
 
@@ -181,19 +88,6 @@ $list-ios-header-color:               #333 !default;
   }
 }
 
-.list,
-ion-card {
-  button.item:not([detail-none]) .item-inner,
-  a.item:not([detail-none]) .item-inner,
-  .item[detail-push] .item-inner {
-    @include ios-detail-push-icon($item-ios-detail-push-color);
-    background-repeat: no-repeat;
-    background-position: right ($item-ios-padding-right - 2) center;
-    background-size: 14px 14px;
-    padding-right: 32px;
-  }
-}
-
 .list + .list {
   margin-top: $list-ios-margin-top + $list-ios-margin-bottom;
 

From 5265f210629fe89ae7cb461c879cf5ea5f8d45a6 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 16:35:13 -0500
Subject: [PATCH 05/12] refactor(list): moved item css outside of the list
 selector and into the proper file md

Cleaned up duplicated CSS and combined selectors, renamed Sass
variables so they are named list if used in the list files.
---
 ionic/components/item/modes/md.scss  | 129 +++++++++++++++++++
 ionic/components/list/modes/ios.scss |  14 +-
 ionic/components/list/modes/md.scss  | 183 ++++-----------------------
 3 files changed, 159 insertions(+), 167 deletions(-)

diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index 651d0bcf52..3c0f67390f 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -42,6 +42,135 @@ ion-note {
   color: $item-md-note-color;
 }
 
+.item {
+  padding-right: ($item-md-padding-right / 2);
+  padding-left: ($item-md-padding-left);
+  font-size: $item-md-font-size;
+  text-transform: none;
+
+  h1 {
+    margin: 0 0 2px;
+    font-size: 2.4rem;
+    font-weight: normal;
+  }
+
+  h2 {
+    margin: 2px 0 2px;
+    font-size: 1.6rem;
+    font-weight: normal;
+  }
+
+  h3,
+  h4,
+  h5,
+  h6 {
+    line-height: normal;
+    margin: 2px 0 2px;
+    font-size: 1.4rem;
+    font-weight: normal;
+  }
+
+  p {
+    line-height: normal;
+    color: #666;
+    font-size: 1.4rem;
+    margin: 0 0 2px;
+  }
+}
+
+.item-inner {
+  border-bottom: 1px solid $item-md-border-color;
+}
+
+ion-item-content {
+  margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0;
+}
+
+button.item.activated {
+  box-shadow: none;
+}
+
+[item-left],
+[item-right] {
+  margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom 0;
+}
+
+icon[item-left],
+icon[item-right] {
+  margin-top: $item-md-padding-icon-top;
+  margin-left: 0;
+  margin-bottom: $item-md-padding-icon-bottom;
+}
+
+button[item-left],
+button[item-right],
+[button][item-left],
+[button][item-right] {
+  padding: 0 0.6em;
+  min-height: 26px;
+  font-size: 1.2rem;
+}
+
+[item-left].icon-only,
+[item-right].icon-only,
+[item-left].icon-only icon,
+[item-right].icon-only icon {
+  padding: 0 1px;
+}
+
+[item-left][clear],
+[item-right][clear] {
+  padding: 0 8px;
+}
+
+[item-left].icon-left icon,
+[item-right].icon-left icon {
+  margin-left: 0;
+  margin-bottom: 1px;
+  padding-right: 0.3em;
+}
+
+[item-left].icon-right icon,
+[item-right].icon-right icon {
+  margin-right: 0;
+  margin-bottom: 1px;
+}
+
+[text-wrap] ion-item-content {
+  font-size: $item-md-body-text-font-size;
+  line-height: $item-md-body-text-line-height;
+}
+
+.item[actions] ion-item-content {
+  margin: 4px;
+}
+
+icon[item-left] + .item-inner,
+icon[item-left] + [text-input] {
+  margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
+}
+
+ion-avatar {
+  min-width: $item-md-avatar-size;
+  min-height: $item-md-avatar-size;
+
+  img {
+    max-width: $item-md-avatar-size;
+    max-height: $item-md-avatar-size;
+    border-radius: $item-md-avatar-size / 2;
+  }
+}
+
+ion-thumbnail {
+  min-width: $item-md-thumbnail-size;
+  min-height: $item-md-thumbnail-size;
+
+  img {
+    max-width: $item-md-thumbnail-size;
+    max-height: $item-md-thumbnail-size;
+  }
+}
+
 .item,
 a.item,
 button.item {
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index 6016fedefe..9cb37bb381 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -19,6 +19,8 @@ $list-ios-header-font-weight:         500 !default;
 $list-ios-header-letter-spacing:      0.1rem !default;
 $list-ios-header-color:               #333 !default;
 
+$list-ios-border-color:               $list-border-color !default;
+
 
 /****************/
 /* DEFAULT LIST */
@@ -39,16 +41,16 @@ $list-ios-header-color:               #333 !default;
 
   ion-header,
   ion-item-group-title {
-    border-bottom: 1px solid $item-ios-border-color;
+    border-bottom: 1px solid $list-ios-border-color;
   }
 
   > .item:first-child {
-    border-top: 1px solid $item-ios-border-color;
+    border-top: 1px solid $list-ios-border-color;
   }
 
   > .item:last-child,
   > ion-item-sliding:last-child .item {
-    border-bottom: 1px solid $item-ios-border-color;
+    border-bottom: 1px solid $list-ios-border-color;
 
     .item-inner {
       border-bottom: none;
@@ -56,7 +58,7 @@ $list-ios-header-color:               #333 !default;
   }
 
   .item-inner {
-    border-bottom: 1px solid $item-ios-border-color;
+    border-bottom: 1px solid $list-ios-border-color;
   }
 
   // If the item has the no-lines attribute remove the bottom border from:
@@ -68,7 +70,7 @@ $list-ios-header-color:               #333 !default;
   }
 
   ion-item-options {
-    border-bottom: 1px solid $item-ios-border-color;
+    border-bottom: 1px solid $list-ios-border-color;
 
     button, [button] {
       min-height: 100%;
@@ -135,7 +137,7 @@ $list-ios-header-color:               #333 !default;
 
   .item {
     margin-top: 0;
-    border-bottom: 1px solid $item-ios-border-color;
+    border-bottom: 1px solid $list-ios-border-color;
 
     .item-inner {
       border-bottom: none;
diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss
index bac8854a72..c0836995ac 100644
--- a/ionic/components/list/modes/md.scss
+++ b/ionic/components/list/modes/md.scss
@@ -17,174 +17,43 @@ $list-md-header-padding:         16px $item-md-padding-right 16px $item-md-paddi
 $list-md-header-font-size:       1.4rem !default;
 $list-md-header-color:           #858585 !default;
 
+$list-md-border-color:          $item-md-border-color !default;
+
 
 /****************/
 /* DEFAULT LIST */
 /****************/
 
 .list {
+  margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left;
+
   ion-header,
-  ion-item-group-title , {
-    border-bottom: 1px solid $item-md-border-color;
+  ion-item-group-title {
+    border-bottom: 1px solid $list-md-border-color;
+    margin-left: 0;
+    padding: $list-md-header-padding;
+    font-size: $list-md-header-font-size;
+    color: $list-md-header-color;
   }
 
-  .item {
-    padding-right: ($item-md-padding-right / 2);
-    padding-left: ($item-md-padding-left);
-    font-size: $item-md-font-size;
-    text-transform: none;
-
-    .item-inner {
-      border-bottom: 1px solid $item-md-border-color;
-    }
+  .item-inner {
+    border-bottom: 1px solid $list-md-border-color;
   }
 
-  > .item:first-child {
-    border-top: 1px solid $item-md-border-color;
+  > .item:first-child,
+  > ion-item-sliding:first-child .item {
+    border-top: 1px solid $list-md-border-color;
   }
 
   > .item:last-child,
   > ion-item-sliding:last-child .item {
-    border-bottom: 1px solid $item-md-border-color;
+    border-bottom: 1px solid $list-md-border-color;
 
     .item-inner {
       border-bottom: none;
     }
   }
 
-  // If the item has the no-lines attribute remove the bottom border from:
-  // the item itself (for last-child items)
-  // the item-inner class (if it is not last)
-  .item[no-lines],
-  .item[no-lines] .item-inner {
-    border-width: 0;
-  }
-
-  ion-header,
-  ion-item-group-title {
-    border-bottom: 1px solid $item-md-border-color;
-    margin-left: 0;
-    padding-left: $item-md-padding-left;
-  }
-
-  ion-item-content {
-    margin: $item-md-padding-top ($item-md-padding-right / 2) $item-md-padding-bottom 0;
-  }
-
-  [item-left],
-  [item-right] {
-    margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom 0;
-  }
-
-  icon[item-left],
-  icon[item-right] {
-    margin-top: $item-md-padding-icon-top;
-    margin-left: 0;
-    margin-bottom: $item-md-padding-icon-bottom;
-  }
-
-  button[item-left],
-  button[item-right],
-  [button][item-left],
-  [button][item-right] {
-    padding: 0 0.6em;
-    min-height: 26px;
-    font-size: 1.2rem;
-  }
-
-  [item-left].icon-only,
-  [item-right].icon-only,
-  [item-left].icon-only icon,
-  [item-right].icon-only icon {
-    padding: 0 1px;
-  }
-
-  [item-left][clear],
-  [item-right][clear] {
-    padding: 0 8px;
-  }
-
-  [item-left].icon-left icon,
-  [item-right].icon-left icon {
-    margin-left: 0;
-    margin-bottom: 1px;
-    padding-right: 0.3em;
-  }
-
-  [item-left].icon-right icon,
-  [item-right].icon-right icon {
-    margin-right: 0;
-    margin-bottom: 1px;
-  }
-
-  [text-wrap] ion-item-content {
-    font-size: $item-md-body-text-font-size;
-    line-height: $item-md-body-text-line-height;
-  }
-
-  .item[actions] ion-item-content {
-    margin: 4px;
-  }
-
-  icon[item-left] + .item-inner,
-  icon[item-left] + [text-input] {
-    margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
-  }
-
-  ion-avatar {
-    min-width: $item-md-avatar-size;
-    min-height: $item-md-avatar-size;
-
-    img {
-      max-width: $item-md-avatar-size;
-      max-height: $item-md-avatar-size;
-      border-radius: $item-md-avatar-size / 2;
-    }
-  }
-
-  ion-thumbnail {
-    min-width: $item-md-thumbnail-size;
-    min-height: $item-md-thumbnail-size;
-
-    img {
-      max-width: $item-md-thumbnail-size;
-      max-height: $item-md-thumbnail-size;
-    }
-  }
-
-  h1 {
-    margin: 0 0 2px;
-    font-size: 2.4rem;
-    font-weight: normal;
-  }
-
-  h2 {
-    margin: 2px 0 2px;
-    font-size: 1.6rem;
-    font-weight: normal;
-  }
-
-  h3,
-  h4,
-  h5,
-  h6 {
-    line-height: normal;
-    margin: 2px 0 2px;
-    font-size: 1.4rem;
-    font-weight: normal;
-  }
-
-  p {
-    line-height: normal;
-    color: #666;
-    font-size: 1.4rem;
-    margin: 0 0 2px;
-  }
-
-  button.item.activated {
-    box-shadow: none;
-  }
-
   ion-item-options {
     button, [button] {
       height: calc(100% - 2px);
@@ -202,15 +71,13 @@ $list-md-header-color:           #858585 !default;
       }
     }
   }
-}
 
-.list {
-  margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left;
-
-  ion-header {
-    padding: $list-md-header-padding;
-    font-size: $list-md-header-font-size;
-    color: $list-md-header-color;
+  // If the item has the no-lines attribute remove the bottom border from:
+  // the item itself (for last-child items)
+  // the item-inner class (if it is not last)
+  .item[no-lines],
+  .item[no-lines] .item-inner {
+    border-width: 0;
   }
 
   + .list {
@@ -234,22 +101,16 @@ $list-md-header-color:           #858585 !default;
 
   .item:first-child {
     border-top-width: 0;
-    margin-top: 0;
     border-top-right-radius: $list-inset-md-border-radius;
     border-top-left-radius: $list-inset-md-border-radius;
   }
 
   .item:last-child {
     border-bottom-width: 0;
-    margin-bottom: 0;
     border-bottom-right-radius: $list-inset-md-border-radius;
     border-bottom-left-radius: $list-inset-md-border-radius;
   }
 
-  .item:not(ion-input):last-child:after {
-    border-bottom: none;
-  }
-
   + .list[inset] {
     margin-top: 0;
   }

From e55e158ab66026223dff7d103c78f0d3595670f3 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 16:51:57 -0500
Subject: [PATCH 06/12] refactor(list): moved ion-item-group-title out of the
 list for iOS

references #387
---
 ionic/components/item/modes/ios.scss | 24 ++++++++++++------------
 ionic/components/list/modes/ios.scss | 10 +---------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss
index 6913705139..24cd141de4 100644
--- a/ionic/components/item/modes/ios.scss
+++ b/ionic/components/item/modes/ios.scss
@@ -29,18 +29,12 @@ $item-ios-divider-padding:            5px 15px !default;
 $item-ios-sliding-content-bg:         $background-color !default;
 $item-ios-sliding-transition:         transform 250ms ease-in-out !default;
 
-.item-group-title {
-  padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left;
-  background-color: $item-ios-divider-bg;
-  color: $item-ios-divider-color;
-}
-
-ion-note {
-  color: $item-ios-note-color;
-}
 
 .item-group {
   ion-item-group-title {
+    padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left;
+    background-color: $item-ios-divider-bg;
+    color: $item-ios-divider-color;
     border-bottom: 1px solid $item-ios-border-color;
   }
 
@@ -51,6 +45,10 @@ ion-note {
   }
 }
 
+ion-note {
+  color: $item-ios-note-color;
+}
+
 .item {
   border-radius: 0;
   padding-left: $item-ios-padding-left;
@@ -79,7 +77,6 @@ ion-item-content {
   margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
 }
 
-// TODO clean up Sass variables
 [item-left] {
   margin: ($item-ios-padding-top / 2) $item-ios-padding-right ($item-ios-padding-bottom / 2) 0;
 }
@@ -167,6 +164,9 @@ a.item:not([detail-none]) .item-inner,
   padding-right: 32px;
 }
 
-&.hairlines .item-inner {
-  border-bottom-width: 0.55px;
+&.hairlines {
+  .item-inner,
+  .item-group ion-item-group-title {
+    border-bottom-width: 0.55px;
+  }
 }
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index 9cb37bb381..4201352f02 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -37,10 +37,6 @@ $list-ios-border-color:               $list-border-color !default;
     letter-spacing: $list-ios-header-letter-spacing;
     text-transform: uppercase;
     color: $list-ios-header-color;
-  }
-
-  ion-header,
-  ion-item-group-title {
     border-bottom: 1px solid $list-ios-border-color;
   }
 
@@ -105,8 +101,7 @@ $list-ios-border-color:               $list-border-color !default;
     border-width: 0.55px;
   }
 
-  ion-header,
-  ion-item-group-title {
+  ion-header {
     border-bottom-width: 0.55px;
   }
 
@@ -136,7 +131,6 @@ $list-ios-border-color:               $list-border-color !default;
   border-radius: $list-inset-ios-border-radius;
 
   .item {
-    margin-top: 0;
     border-bottom: 1px solid $list-ios-border-color;
 
     .item-inner {
@@ -146,7 +140,6 @@ $list-ios-border-color:               $list-border-color !default;
 
   > .item:first-child,
   ion-header {
-    margin-top: 0;
     border-top-right-radius: $list-inset-ios-border-radius;
     border-top-left-radius: $list-inset-ios-border-radius;
   }
@@ -157,7 +150,6 @@ $list-ios-border-color:               $list-border-color !default;
 
   > .item:last-child,
   > ion-item-sliding:last-child .item {
-    margin-bottom: 0;
     border-bottom-right-radius: $list-inset-ios-border-radius;
     border-bottom-left-radius: $list-inset-ios-border-radius;
     border-bottom: none;

From 3e2100f5d0c0b6b180ecd653fbe3e276a34ac7dd Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 19:10:26 -0500
Subject: [PATCH 07/12] fix(item): fixed padding right on md items

references #518
---
 ionic/components/item/modes/md.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index 3c0f67390f..fd9698a33d 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -43,7 +43,7 @@ ion-note {
 }
 
 .item {
-  padding-right: ($item-md-padding-right / 2);
+  padding-right: 0;
   padding-left: ($item-md-padding-left);
   font-size: $item-md-font-size;
   text-transform: none;
@@ -80,6 +80,7 @@ ion-note {
 
 .item-inner {
   border-bottom: 1px solid $item-md-border-color;
+  padding-right: ($item-md-padding-right / 2);
 }
 
 ion-item-content {

From 8b4e528732bbe5130abdbc2c07a8df9a42737c3a Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 19:11:49 -0500
Subject: [PATCH 08/12] fix(text-input): removed the margin-left on floating
 and stacked labels

fixes #518
---
 ionic/components/text-input/modes/md.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ionic/components/text-input/modes/md.scss b/ionic/components/text-input/modes/md.scss
index 42aad570a7..3d01e220a4 100644
--- a/ionic/components/text-input/modes/md.scss
+++ b/ionic/components/text-input/modes/md.scss
@@ -43,6 +43,11 @@ ion-card {
     margin-bottom: 0;
   }
 
+  [stacked-label] ion-label,
+  [floating-label] ion-label {
+    margin-left: 0;
+  }
+
   [stacked-label].has-focus ion-label,
   [floating-label].has-focus ion-label {
     color: $text-input-highlight-color;
@@ -52,6 +57,7 @@ ion-card {
   [floating-label] [text-input] {
     margin-bottom: 8px;
     margin-top: 8px;
+    margin-left: 0;
   }
 
   [floating-label] ion-label {

From e5553e5f057e82a946ef734b54718dabc13fa222 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 19:12:17 -0500
Subject: [PATCH 09/12] fix(card): removed duplicate item css in the card and
 removed the border for now

references #387
---
 ionic/components/card/modes/ios.scss | 44 +++-------------------------
 ionic/components/card/modes/md.scss  | 40 ++-----------------------
 2 files changed, 6 insertions(+), 78 deletions(-)

diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss
index 6a41f81645..bd41c63d78 100644
--- a/ionic/components/card/modes/ios.scss
+++ b/ionic/components/card/modes/ios.scss
@@ -53,13 +53,11 @@ ion-card {
   }
 
   .item {
-    padding-left: ($card-ios-padding-left / 2);
-    padding-right: ($card-ios-padding-right / 2);
-    font-size: $item-ios-font-size;
+    padding-left: $card-ios-padding-left / 2;
   }
 
-  ion-item-content {
-    padding: $card-ios-padding-top ($card-ios-padding-right / 2) $card-ios-padding-bottom ($card-ios-padding-left / 2);
+  .item-inner {
+    border: none;
   }
 
   ion-card-content {
@@ -89,28 +87,13 @@ ion-card {
 
     button,
     [button] {
-      margin: $item-ios-padding-icon-top ($item-ios-padding-right / 2) $item-ios-padding-icon-bottom ($item-ios-padding-left / 2);
+      margin: 0 ($item-ios-padding-right / 2);
       padding: 2px 6px;
       min-height: 26px;
       font-size: 1.3rem;
     }
   }
 
-  [item-left],
-  [item-right] {
-    margin: $card-ios-padding-media-top ($card-ios-padding-right / 2) $card-ios-padding-media-bottom ($card-ios-padding-left / 2);
-  }
-
-  button[item-left],
-  button[item-right],
-  [button][item-left],
-  [button][item-right], {
-    margin: $item-ios-padding-icon-top ($item-ios-padding-right / 2) $item-ios-padding-icon-bottom ($item-ios-padding-left / 2);
-    padding: 2px 6px;
-    min-height: 26px;
-    font-size: 1.3rem;
-  }
-
   ion-note[item-left],
   ion-note[item-right], {
     font-size: 1.3rem;
@@ -122,25 +105,6 @@ ion-card {
     color: $card-ios-title-text-color;
   }
 
-  ion-avatar {
-    min-width: $item-ios-avatar-size;
-
-    img {
-      max-width: $item-ios-avatar-size;
-      max-height: $item-ios-avatar-size;
-      border-radius: $item-ios-avatar-size / 2;
-    }
-  }
-
-  ion-thumbnail  {
-    min-width: $item-ios-thumbnail-size;
-
-    img {
-      max-width: $item-ios-thumbnail-size;
-      max-height: $item-ios-thumbnail-size;
-    }
-  }
-
   h1 {
     margin: 0 0 2px;
     font-size: 2.4rem;
diff --git a/ionic/components/card/modes/md.scss b/ionic/components/card/modes/md.scss
index cfd7c0e1fd..475beea172 100644
--- a/ionic/components/card/modes/md.scss
+++ b/ionic/components/card/modes/md.scss
@@ -52,13 +52,11 @@ ion-card {
   }
 
   .item {
-    padding-right: ($card-md-padding-right / 2);
-    padding-left: ($card-md-padding-left / 2);
     font-size: $item-md-font-size;
   }
 
-  ion-item-content {
-    padding: $card-md-padding-top ($card-md-padding-right / 2) $card-md-padding-bottom ($card-md-padding-left / 2);
+  .item-inner {
+    border: none;
   }
 
   ion-card-content {
@@ -88,21 +86,6 @@ ion-card {
     }
   }
 
-  [item-left],
-  [item-right] {
-    margin: $card-md-padding-media-top ($card-md-padding-right / 2) $card-md-padding-media-bottom ($card-md-padding-left / 2);
-  }
-
-  button[item-left],
-  button[item-right],
-  [button][item-left],
-  [button][item-right], {
-    margin: 0 ($card-md-padding-right / 4) 0 ($card-md-padding-left / 4);
-    min-height: 26px;
-    font-size: 1.3rem;
-    border-color: transparent;
-  }
-
   ion-note[item-left],
   ion-note[item-right], {
     font-size: 1.3rem;
@@ -114,25 +97,6 @@ ion-card {
     color: $card-md-title-text-color;
   }
 
-  ion-avatar {
-    min-width: $card-md-avatar-size;
-
-    img {
-      max-width: $card-md-avatar-size;
-      max-height: $card-md-avatar-size;
-      border-radius: $card-md-avatar-size / 2;
-    }
-  }
-
-  ion-thumbnail {
-    min-width: $card-md-thumbnail-size;
-
-    img {
-      max-width: $card-md-thumbnail-size;
-      max-height: $card-md-thumbnail-size;
-    }
-  }
-
   h1 {
     margin: 0 0 2px;
     font-size: 2.4rem;

From 59e4faa5b98c66fbcc27adefeba38eecee4fde11 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 19:21:15 -0500
Subject: [PATCH 10/12] fix(card): fixed border radius for lists in cards and
 removed border bottom of last item in list

references #387
---
 ionic/components/card/card.scss      | 12 ++++++++++++
 ionic/components/card/modes/ios.scss |  5 +++++
 ionic/components/card/modes/md.scss  |  5 +++++
 3 files changed, 22 insertions(+)

diff --git a/ionic/components/card/card.scss b/ionic/components/card/card.scss
index f5aa26f32d..f14385a093 100644
--- a/ionic/components/card/card.scss
+++ b/ionic/components/card/card.scss
@@ -22,3 +22,15 @@ ion-card-header {
 ion-card-content {
   display: block;
 }
+
+ion-card {
+  > .list:first-child {
+    border-top-left-radius: inherit;
+    border-top-right-radius: inherit;
+  }
+
+  > .list:last-child {
+    border-bottom-left-radius: inherit;
+    border-bottom-right-radius: inherit;
+  }
+}
diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss
index bd41c63d78..335388f50a 100644
--- a/ionic/components/card/modes/ios.scss
+++ b/ionic/components/card/modes/ios.scss
@@ -50,6 +50,11 @@ ion-card {
     ion-item-content {
       padding: 0;
     }
+
+    > .item:last-child,
+    > ion-item-sliding:last-child .item {
+      border-bottom: none;
+    }
   }
 
   .item {
diff --git a/ionic/components/card/modes/md.scss b/ionic/components/card/modes/md.scss
index 475beea172..caba059d5d 100644
--- a/ionic/components/card/modes/md.scss
+++ b/ionic/components/card/modes/md.scss
@@ -49,6 +49,11 @@ ion-card {
     ion-item-content {
       padding: 0;
     }
+
+    > .item:last-child,
+    > ion-item-sliding:last-child .item {
+      border-bottom: none;
+    }
   }
 
   .item {

From b01795de3f9012b5f45b2d31e85461683f37db6f Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 19:56:09 -0500
Subject: [PATCH 11/12] fix(item): fixing font-weight for button items on md

---
 ionic/components/item/modes/md.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index fd9698a33d..73e412acdc 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -47,6 +47,7 @@ ion-note {
   padding-left: ($item-md-padding-left);
   font-size: $item-md-font-size;
   text-transform: none;
+  font-weight: normal;
 
   h1 {
     margin: 0 0 2px;

From cd365a60b3ad0adb09706627bf8bcb640ea52e99 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 16 Nov 2015 20:09:08 -0500
Subject: [PATCH 12/12] fix(item): removed box-shadow on items - buttons md

---
 ionic/components/item/modes/md.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index 73e412acdc..6213e8cfe1 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -48,6 +48,7 @@ ion-note {
   font-size: $item-md-font-size;
   text-transform: none;
   font-weight: normal;
+  box-shadow: none;
 
   h1 {
     margin: 0 0 2px;