From 04c795ec0e045fc549d1af1d7bf864df0af23eed Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 30 Oct 2015 17:47:08 -0400
Subject: [PATCH] refactor(list): changing no-borders to no-lines b/c Ben hated
 it

Added line for headers on Android. Added some more tests for cards with
lists. Removed unused CSS. References #387
---
 ionic/components/card/test/list/main.html     | 65 ++++++++++++++++++-
 ionic/components/item/item.scss               |  9 ---
 ionic/components/list/modes/ios.scss          |  4 +-
 ionic/components/list/modes/md.scss           |  7 +-
 .../list/test/{no-borders => no-lines}/e2e.ts |  0
 .../test/{no-borders => no-lines}/index.ts    |  0
 .../test/{no-borders => no-lines}/main.html   |  4 +-
 7 files changed, 73 insertions(+), 16 deletions(-)
 rename ionic/components/list/test/{no-borders => no-lines}/e2e.ts (100%)
 rename ionic/components/list/test/{no-borders => no-lines}/index.ts (100%)
 rename ionic/components/list/test/{no-borders => no-lines}/main.html (84%)

diff --git a/ionic/components/card/test/list/main.html b/ionic/components/card/test/list/main.html
index cb5f836929..7e426fdc17 100644
--- a/ionic/components/card/test/list/main.html
+++ b/ionic/components/card/test/list/main.html
@@ -8,7 +8,7 @@
     <ion-list>
 
       <ion-header>
-        List Header
+        Card List
       </ion-header>
 
       <ion-switch>
@@ -36,5 +36,68 @@
 
   </ion-card>
 
+  <ion-card>
+
+    <ion-list no-lines>
+
+      <ion-header>
+        Card List Without Lines
+      </ion-header>
+
+      <ion-switch>
+        <icon wifi item-left></icon>
+        Wifi
+      </ion-switch>
+
+      <ion-item>
+        <icon heart item-left></icon>
+        Affection
+        <ion-note item-right>
+          Very Little
+        </ion-note>
+      </ion-item>
+
+      <ion-item>
+        <icon home item-left></icon>
+        Home
+        <ion-note item-right>
+          Where the heart is
+        </ion-note>
+      </ion-item>
+
+    </ion-list>
+
+  </ion-card>
+
+  <ion-card>
+
+    <ion-card-header>
+      Card With Items (No List)
+    </ion-card-header>
+
+    <ion-switch>
+      <icon wifi item-left></icon>
+      Wifi
+    </ion-switch>
+
+    <ion-item>
+      <icon heart item-left></icon>
+      Affection
+      <ion-note item-right>
+        Very Little
+      </ion-note>
+    </ion-item>
+
+    <ion-item>
+      <icon home item-left></icon>
+      Home
+      <ion-note item-right>
+        Where the heart is
+      </ion-note>
+    </ion-item>
+
+
+  </ion-card>
+
 
 </ion-content>
diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss
index f2f481a172..1bbafda128 100644
--- a/ionic/components/item/item.scss
+++ b/ionic/components/item/item.scss
@@ -129,15 +129,6 @@ ion-input.item {
   align-items: flex-start;
 }
 
-.item.item.item.no-border-bottom:after,
-.item.item.item.no-border-bottom + .item:before {
-  border: none;
-}
-
-.item.item.item.no-border-bottom + .item {
-  margin-top: -13px;
-}
-
 /**
  * The hidden right-side buttons that can be exposed under a list item
  * with dragging.
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index 4afcceaaef..e50f11b194 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -88,8 +88,8 @@ $list-ios-header-color:               #333 !default;
   margin-top: 0;
 }
 
-&.hairlines .list[no-borders],
-.list[no-borders] {
+&.hairlines .list[no-lines],
+.list[no-lines] {
   ion-header:after,
   .item:before,
   .item:after {
diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss
index 68b7929d44..5ddfdcfa83 100644
--- a/ionic/components/list/modes/md.scss
+++ b/ionic/components/list/modes/md.scss
@@ -67,8 +67,11 @@ $list-md-header-color:           #858585 !default;
   margin-top: 0;
 }
 
-.list[no-borders] {
-  ion-header:after,
+.list[no-lines] {
+  ion-header + .item:before {
+    border-width: 1px;
+  }
+
   .item:before,
   .item:after {
     border-width: 0;
diff --git a/ionic/components/list/test/no-borders/e2e.ts b/ionic/components/list/test/no-lines/e2e.ts
similarity index 100%
rename from ionic/components/list/test/no-borders/e2e.ts
rename to ionic/components/list/test/no-lines/e2e.ts
diff --git a/ionic/components/list/test/no-borders/index.ts b/ionic/components/list/test/no-lines/index.ts
similarity index 100%
rename from ionic/components/list/test/no-borders/index.ts
rename to ionic/components/list/test/no-lines/index.ts
diff --git a/ionic/components/list/test/no-borders/main.html b/ionic/components/list/test/no-lines/main.html
similarity index 84%
rename from ionic/components/list/test/no-borders/main.html
rename to ionic/components/list/test/no-lines/main.html
index 4b0c640011..3f53208344 100644
--- a/ionic/components/list/test/no-borders/main.html
+++ b/ionic/components/list/test/no-lines/main.html
@@ -1,7 +1,7 @@
-<ion-toolbar><ion-title>List No Borders</ion-title></ion-toolbar>
+<ion-toolbar><ion-title>List No Lines</ion-title></ion-toolbar>
 
 <ion-content class="outer-content">
-  <ion-list no-borders>
+  <ion-list no-lines>
     <ion-header>
       List Header
     </ion-header>