From 6827adb2818269fdb60ed77f544a387269742d2b Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 30 Oct 2015 16:02:04 -0400
Subject: [PATCH 01/13] feat(card): added list example to card and modified
 padding and margin for it

references #387
---
 ionic/components/card/modes/ios.scss      |  8 +++++
 ionic/components/card/modes/md.scss       |  8 +++++
 ionic/components/card/test/list/e2e.ts    |  0
 ionic/components/card/test/list/index.ts  |  7 ++++
 ionic/components/card/test/list/main.html | 40 +++++++++++++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 ionic/components/card/test/list/e2e.ts
 create mode 100644 ionic/components/card/test/list/index.ts
 create mode 100644 ionic/components/card/test/list/main.html

diff --git a/ionic/components/card/modes/ios.scss b/ionic/components/card/modes/ios.scss
index 141206ad35..2866f0b076 100644
--- a/ionic/components/card/modes/ios.scss
+++ b/ionic/components/card/modes/ios.scss
@@ -40,6 +40,14 @@ ion-card {
   border-radius: $card-ios-border-radius;
   overflow: hidden;
 
+  .list {
+    margin-bottom: 0;
+
+    ion-item-content {
+      padding: 0;
+    }
+  }
+
   .item {
     padding-right: ($card-ios-padding-right / 2);
     padding-left: ($card-ios-padding-left / 2);
diff --git a/ionic/components/card/modes/md.scss b/ionic/components/card/modes/md.scss
index fc075c0fbb..cfd7c0e1fd 100644
--- a/ionic/components/card/modes/md.scss
+++ b/ionic/components/card/modes/md.scss
@@ -43,6 +43,14 @@ ion-card {
   border-radius: $card-md-border-radius;
   overflow: hidden;
 
+  .list {
+    margin-bottom: 0;
+
+    ion-item-content {
+      padding: 0;
+    }
+  }
+
   .item {
     padding-right: ($card-md-padding-right / 2);
     padding-left: ($card-md-padding-left / 2);
diff --git a/ionic/components/card/test/list/e2e.ts b/ionic/components/card/test/list/e2e.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ionic/components/card/test/list/index.ts b/ionic/components/card/test/list/index.ts
new file mode 100644
index 0000000000..43aed36502
--- /dev/null
+++ b/ionic/components/card/test/list/index.ts
@@ -0,0 +1,7 @@
+import {App} from 'ionic/ionic';
+
+
+@App({
+  templateUrl: 'main.html'
+})
+class E2EApp {}
diff --git a/ionic/components/card/test/list/main.html b/ionic/components/card/test/list/main.html
new file mode 100644
index 0000000000..cb5f836929
--- /dev/null
+++ b/ionic/components/card/test/list/main.html
@@ -0,0 +1,40 @@
+
+<ion-toolbar><ion-title>List Cards</ion-title></ion-toolbar>
+
+<ion-content class="outer-content">
+
+  <ion-card>
+
+    <ion-list>
+
+      <ion-header>
+        List Header
+      </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-content>

From fe55efb30767fac07d1873e65cb923f1e7ed498c Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 30 Oct 2015 16:30:29 -0400
Subject: [PATCH 02/13] feat(list): added no-borders attribute for lists

if you apply the no-borders attribute it will remove all borders inside
of a list. Added a test case for showing this.
---
 ionic/components/list/modes/ios.scss          |  9 ++++++
 ionic/components/list/modes/md.scss           |  8 +++++
 ionic/components/list/test/no-borders/e2e.ts  |  0
 .../components/list/test/no-borders/index.ts  |  7 +++++
 .../components/list/test/no-borders/main.html | 30 +++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 ionic/components/list/test/no-borders/e2e.ts
 create mode 100644 ionic/components/list/test/no-borders/index.ts
 create mode 100644 ionic/components/list/test/no-borders/main.html

diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index 627e926443..4afcceaaef 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -87,3 +87,12 @@ $list-ios-header-color:               #333 !default;
 .list[inset] + .list[inset] {
   margin-top: 0;
 }
+
+&.hairlines .list[no-borders],
+.list[no-borders] {
+  ion-header:after,
+  .item:before,
+  .item:after {
+    border-width: 0;
+  }
+}
diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss
index ac2d936bda..68b7929d44 100644
--- a/ionic/components/list/modes/md.scss
+++ b/ionic/components/list/modes/md.scss
@@ -66,3 +66,11 @@ $list-md-header-color:           #858585 !default;
 .list[inset] + .list[inset] {
   margin-top: 0;
 }
+
+.list[no-borders] {
+  ion-header:after,
+  .item:before,
+  .item:after {
+    border-width: 0;
+  }
+}
diff --git a/ionic/components/list/test/no-borders/e2e.ts b/ionic/components/list/test/no-borders/e2e.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ionic/components/list/test/no-borders/index.ts b/ionic/components/list/test/no-borders/index.ts
new file mode 100644
index 0000000000..43aed36502
--- /dev/null
+++ b/ionic/components/list/test/no-borders/index.ts
@@ -0,0 +1,7 @@
+import {App} from 'ionic/ionic';
+
+
+@App({
+  templateUrl: 'main.html'
+})
+class E2EApp {}
diff --git a/ionic/components/list/test/no-borders/main.html b/ionic/components/list/test/no-borders/main.html
new file mode 100644
index 0000000000..4b0c640011
--- /dev/null
+++ b/ionic/components/list/test/no-borders/main.html
@@ -0,0 +1,30 @@
+<ion-toolbar><ion-title>List No Borders</ion-title></ion-toolbar>
+
+<ion-content class="outer-content">
+  <ion-list no-borders>
+    <ion-header>
+      List Header
+    </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-content>

From 0b861dde4636d8021fcf37c4a2086dd49ea9e9e3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 30 Oct 2015 15:42:33 -0500
Subject: [PATCH 03/13] fix(setRoot): prevent flicker

Closes #381
---
 ionic/components/nav/nav-controller.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index 8ee53827db..681c418bdb 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -181,9 +181,11 @@ export class NavController extends Ion {
     // add the view to the stack
     this._add(enteringView);
 
-    raf(() => {
-      this._cleanup(enteringView);
-    });
+    if (opts.preCleanup !== false) {
+      raf(() => {
+        this._cleanup(enteringView);
+      });  
+    }
 
     if (this.router) {
       // notify router of the state change
@@ -363,6 +365,7 @@ export class NavController extends Ion {
 
     // if animate has not been set then default to false
     opts.animate = opts.animate || false;
+    opts.preCleanup = false;
 
     // ensure leaving views are not cached, and should be destroyed
     opts.cacheLeavingView = false;

From 3fa2f6b7de4d519cc3e66c4dd1c519f6ac7157eb Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Fri, 30 Oct 2015 13:38:25 -0500
Subject: [PATCH 04/13] docs(components): import ionic sass

---
 gulpfile.js                            | 4 +++-
 scripts/demos/docs.index.template.html | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index d3199e440c..e730b36a16 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -459,12 +459,14 @@ gulp.task('build.demos', function(){
 gulp.task('sass.demos:docs', function() {
   var sass = require('gulp-sass');
   var autoprefixer = require('gulp-autoprefixer');
+  var concat = require('gulp-concat');
   return gulp.src([
-      'demos/component-docs/app.scss'
+      'demos/component-docs/app.scss',
     ])
     .pipe(sass()
       .on('error', sass.logError)
     )
+    .pipe(concat('app.css'))
     .pipe(autoprefixer(buildConfig.autoprefixer))
     .pipe(gulp.dest('dist/demos/component-docs/'));
 });
diff --git a/scripts/demos/docs.index.template.html b/scripts/demos/docs.index.template.html
index a3f4d6e920..8ba93aaf61 100644
--- a/scripts/demos/docs.index.template.html
+++ b/scripts/demos/docs.index.template.html
@@ -5,7 +5,6 @@
   <!-- https://www.chromium.org/developers/design-documents/chromium-graphics/how-to-get-gpu-rasterization -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 
-  <link href="/css/v2-demos/css/ionic.css" rel="stylesheet">
   <link rel="stylesheet" type="text/css" href="app.css">
 
 </head>

From 9c23eb45bdef78c6d955e4c7f15e7d396303b8aa Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Fri, 30 Oct 2015 13:39:06 -0500
Subject: [PATCH 05/13] docs(demos): add custom colors

---
 demos/component-docs/app.scss             | 12 ++++++++++++
 demos/component-docs/inputs/checkbox.html |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/demos/component-docs/app.scss b/demos/component-docs/app.scss
index b2f144f7bf..5448da0315 100644
--- a/demos/component-docs/app.scss
+++ b/demos/component-docs/app.scss
@@ -1,3 +1,13 @@
+$colors: (
+  primary:    #387ef5,
+  secondary:  #32db64,
+  danger:     #f53d3d,
+  light:      #f4f4f4,
+  dark:       #222,
+  energized:  #ffc527,
+  royal:      #7e60ff,
+);
+
 body, body:hover, body a, body button, body media-switch {
   cursor: url('http://ionicframework.com/img/finger.png'), auto;
 }
@@ -331,4 +341,6 @@ body.md button[fab].fab-map {
   top: 220px;
 }
 
+@import "../../ionic/ionic";
+
 
diff --git a/demos/component-docs/inputs/checkbox.html b/demos/component-docs/inputs/checkbox.html
index cf701aa729..55adaa2c66 100644
--- a/demos/component-docs/inputs/checkbox.html
+++ b/demos/component-docs/inputs/checkbox.html
@@ -35,11 +35,11 @@
       Khal Drogo
     </ion-checkbox>
 
-    <ion-checkbox dark>
+    <ion-checkbox energized checked="true" dark>
       Cersei Lannister
     </ion-checkbox>
 
-    <ion-checkbox primary checked="true">
+    <ion-checkbox royal checked="true">
       Stannis Baratheon
     </ion-checkbox>
 
@@ -55,7 +55,7 @@
       Catelyn Stark
     </ion-checkbox>
 
-    <ion-checkbox primary>
+    <ion-checkbox royal>
       Bronn
     </ion-checkbox>
 

From e5d28e0639df6a89c9fa4e5b05e7e93cbadb744c Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Fri, 30 Oct 2015 15:47:15 -0500
Subject: [PATCH 06/13] feat: add -path, -font-path

---
 ionic/fonts/ionicons.scss | 2 +-
 ionic/fonts/roboto.scss   | 9 +++++----
 ionic/ionic.core.scss     | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ionic/fonts/ionicons.scss b/ionic/fonts/ionicons.scss
index 803e7faa4a..dc6f011de4 100644
--- a/ionic/fonts/ionicons.scss
+++ b/ionic/fonts/ionicons.scss
@@ -2,7 +2,7 @@
 // Ionicons
 // --------------------------
 
-$ionicons-font-path: "../fonts" !default;
+$ionicons-font-path: $font-path !default;
 $ionicons-font-family: "Ionicons" !default;
 $ionicons-version: "3.0.0" !default;
 
diff --git a/ionic/fonts/roboto.scss b/ionic/fonts/roboto.scss
index 34e09dc7db..638cdb834a 100644
--- a/ionic/fonts/roboto.scss
+++ b/ionic/fonts/roboto.scss
@@ -5,31 +5,32 @@
   http://www.apache.org/licenses/LICENSE-2.0.html
  */
 
+$roboto-font-path: $font-path !default;
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 300;
-  src: local('Roboto Light'), local('Roboto-Light'), url(../fonts/roboto-light.ttf) format('truetype'), url(../fonts/roboto-light.woff) format('woff');
+  src: local('Roboto Light'), local('Roboto-Light'), url('#{$roboto-font-path}/roboto-light.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-light.woff') format('woff');
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto-regular.ttf) format('truetype'), url(../fonts/roboto-regular.woff) format('woff');
+  src: local('Roboto'), local('Roboto-Regular'), url('#{$roboto-font-path}/roboto-regular.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-regular.woff') format('woff');
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 500;
-  src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto-medium.ttf) format('truetype'), url(../fonts/roboto-medium.woff) format('woff');
+  src: local('Roboto Medium'), local('Roboto-Medium'), url('#{$roboto-font-path}/roboto-medium.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-medium.woff') format('woff');
 }
 
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 700;
-  src: local('Roboto Bold'), local('Roboto-Bold'), url(../fonts/roboto-bold.ttf) format('truetype'), url(../fonts/roboto-bold.woff) format('woff');
+  src: local('Roboto Bold'), local('Roboto-Bold'), url('#{$roboto-font-path}/roboto-bold.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-bold.woff') format('woff');
 }
diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss
index 045b7abd6a..c8bf1d9991 100644
--- a/ionic/ionic.core.scss
+++ b/ionic/ionic.core.scss
@@ -49,6 +49,7 @@
 
 
 // Ionicons
+$font-path: "../fonts" !default;
 $ionicons: true !default;
 @if ($ionicons) {
   @import "fonts/ionicons";

From 1f390d0fdaedf08272ca86b51a0d834a437ed57a Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Fri, 30 Oct 2015 15:54:03 -0500
Subject: [PATCH 07/13] docs(demos): set font path

---
 demos/component-docs/app.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/component-docs/app.scss b/demos/component-docs/app.scss
index 5448da0315..753e0d23dc 100644
--- a/demos/component-docs/app.scss
+++ b/demos/component-docs/app.scss
@@ -8,6 +8,10 @@ $colors: (
   royal:      #7e60ff,
 );
 
+$font-path: '../../dist/fonts';
+@import "../../ionic/ionic";
+
+
 body, body:hover, body a, body button, body media-switch {
   cursor: url('http://ionicframework.com/img/finger.png'), auto;
 }
@@ -340,7 +344,3 @@ body.ios button[fab].fab-map {
 body.md button[fab].fab-map {
   top: 220px;
 }
-
-@import "../../ionic/ionic";
-
-

From eb46236b8ef3e52ecdd177b40ec097e56a300454 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 30 Oct 2015 15:58:36 -0500
Subject: [PATCH 08/13] test(setRoot): close menu on nav resolve

---
 ionic/components/menu/test/basic/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ionic/components/menu/test/basic/index.ts b/ionic/components/menu/test/basic/index.ts
index 5823347efd..11ecb7b8d2 100644
--- a/ionic/components/menu/test/basic/index.ts
+++ b/ionic/components/menu/test/basic/index.ts
@@ -37,12 +37,13 @@ class E2EApp {
   }
 
   openPage(page) {
-    // close the menu when clicking a link from the menu
-    this.app.getComponent('leftMenu').close();
-
     // Reset the content nav to have just this page
     // we wouldn't want the back button to show in this scenario
     let nav = this.app.getComponent('nav');
-    nav.setRoot(page.component);
+    nav.setRoot(page.component).then(() => {
+      // wait for the root page to be completely loaded
+      // then close the menu
+      this.app.getComponent('leftMenu').close();
+    });
   }
 }

From 2d205a3a24e25afdfc297c128a1f76b8a901eaeb Mon Sep 17 00:00:00 2001
From: Drew Rygh <drew.rygh@gmail.com>
Date: Fri, 30 Oct 2015 16:30:20 -0500
Subject: [PATCH 09/13] docs(demos): colored switches

---
 demos/component-docs/inputs/switch.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/demos/component-docs/inputs/switch.html b/demos/component-docs/inputs/switch.html
index 231085a1c5..90ca6e2545 100644
--- a/demos/component-docs/inputs/switch.html
+++ b/demos/component-docs/inputs/switch.html
@@ -14,7 +14,7 @@
     Frodo Baggins
   </ion-switch>
 
-  <ion-switch light>
+  <ion-switch energized>
     Sam
   </ion-switch>
 
@@ -22,7 +22,7 @@
     Éowyn
   </ion-switch>
 
-  <ion-switch secondary checked="true">
+  <ion-switch royal checked="true">
     Legolas
   </ion-switch>
 
@@ -34,7 +34,7 @@
     Saruman
   </ion-switch>
 
-  <ion-switch light checked="true">
+  <ion-switch energized checked="true">
     Gandalf
   </ion-switch>
 
@@ -46,7 +46,7 @@
     Treebeard
   </ion-switch>
 
-  <ion-switch primary>
+  <ion-switch royal>
     Boromir
   </ion-switch>
 
@@ -54,7 +54,7 @@
     Gollum
   </ion-switch>
 
-  <ion-switch light>
+  <ion-switch energized>
     Galadriel
   </ion-switch>
 

From 17f1474527a72122b5e8268b019ac6d54c53760f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 30 Oct 2015 16:30:27 -0500
Subject: [PATCH 10/13] test(nav): nested navs wip

---
 ionic/components/nav/test/nested/index.ts | 108 ++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 ionic/components/nav/test/nested/index.ts

diff --git a/ionic/components/nav/test/nested/index.ts b/ionic/components/nav/test/nested/index.ts
new file mode 100644
index 0000000000..ad14126e51
--- /dev/null
+++ b/ionic/components/nav/test/nested/index.ts
@@ -0,0 +1,108 @@
+import {App, NavController} from 'ionic/ionic';
+import {Page, Config, IonicApp} from 'ionic/ionic';
+import {NavParams, NavController, ViewController} from 'ionic/ionic';
+
+
+@Page({
+  template: `
+    <ion-navbar *navbar>
+      <ion-title>Login</ion-title>
+    </ion-navbar>
+    <ion-content style="text-align:center;" padding>
+      <button (click)="goToAccount()">Login</button>
+    </ion-content>
+  `
+})
+export class Login {
+  constructor(nav: NavController) {
+    this.nav = nav;
+  }
+
+  goToAccount() {
+    this.nav.push(Account);
+  }
+}
+
+
+ @Page({
+  template: `
+    <ion-menu [content]="content">
+     <ion-toolbar secondary>
+       <ion-title>Account Menu</ion-title>
+     </ion-toolbar>
+     <ion-content>
+       <ion-list>
+         <button ion-item (click)="goToProfile()">
+           Profile
+         </button>
+         <button ion-item (click)="goToDashboard()">
+           Dashboard
+         </button>
+         <button ion-item detail-none (click)="logOut()">
+           Logout
+         </button>
+       </ion-list>
+     </ion-content>
+    </ion-menu>
+
+    <ion-nav id="account-nav" [root]="rootPage" #content swipe-back-enabled="false"></ion-nav>
+  `
+})
+export class Account {
+  constructor(app: IonicApp) {
+    this.app = app;
+    this.rootPage = Dashboard;
+  }
+
+  goToProfile() {
+    this.app.getComponent('account-nav').setRoot(Profile).then(() => {
+      this.app.getComponent('menu').close();
+    });
+  }
+
+  goToDashboard() {
+    this.app.getComponent('account-nav').setRoot(Dashboard).then(() => {
+      this.app.getComponent('menu').close();
+    });
+  }
+
+  logOut() {
+    this.app.getComponent('root-nav').setRoot(Login);
+  }
+}
+
+
+@Page({
+  template: `
+    <ion-navbar *navbar primary>
+      <ion-title>Account Dashboard</ion-title>
+    </ion-navbar>
+    <ion-content padding>
+      Dashboard
+    </ion-content>
+  `
+})
+export class Dashboard {}
+
+
+@Page({
+  template: `
+    <ion-navbar *navbar danger>
+      <ion-title>Account Profile</ion-title>
+    </ion-navbar>
+    <ion-content padding>
+      Profile
+    </ion-content>
+  `
+})
+export class Profile {}
+
+
+@App({
+  template: `<ion-nav id="root-nav" [root]="rootPage" swipe-back-enabled="false"></ion-nav>`
+})
+class E2EApp {
+  constructor() {
+    this.rootPage = Login;
+  }
+}

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 11/13] 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>

From 33452f5ce777e2d4d51e6c4db24997c5c64d3760 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 30 Oct 2015 17:47:53 -0400
Subject: [PATCH 12/13] refactor(list): combined hairline css together

references #387
---
 ionic/components/item/modes/ios.scss | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss
index bc4c36f514..4209ba4ebe 100644
--- a/ionic/components/item/modes/ios.scss
+++ b/ionic/components/item/modes/ios.scss
@@ -238,29 +238,33 @@ ion-card {
   }
 }
 
-&.hairlines .list ion-item-options {
+&.hairlines .list {
+
+  ion-item-options {
     button, [button] {
       min-height: calc(100% - 1px);
       height: calc(100% - 1px);
       margin-top: 0.55px;
       margin-bottom: 0.55px;
     }
-}
-
-&.hairlines .list ion-item-sliding-content {
-  margin-top: 0.55px;
-  margin-bottom: 0.55px;
-}
-
-&.hairlines .list .item {
-  margin-top: -0.55px;
-
-  &:last-child {
-    margin-bottom: -0.55px;
   }
 
-  &:before,
-  &:after {
-    border-top-width: 0.55px;
+  ion-item-sliding-content {
+    margin-top: 0.55px;
+    margin-bottom: 0.55px;
   }
+
+  .item {
+    margin-top: -0.55px;
+
+    &:last-child {
+      margin-bottom: -0.55px;
+    }
+
+    &:before,
+    &:after {
+      border-top-width: 0.55px;
+    }
+  }
+
 }

From 4148ca56367d93b16424a175280a4a6dbd36364e Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 30 Oct 2015 18:14:50 -0400
Subject: [PATCH 13/13] refactor(item): added the ability to assign no-lines to
 an item and remove the borders on that item only

references #387
---
 ionic/components/item/modes/ios.scss      | 11 +++++++++++
 ionic/components/item/modes/md.scss       | 11 +++++++++++
 ionic/components/item/test/text/main.html |  6 +++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss
index 4209ba4ebe..5187d8efc5 100644
--- a/ionic/components/item/modes/ios.scss
+++ b/ionic/components/item/modes/ios.scss
@@ -268,3 +268,14 @@ ion-card {
   }
 
 }
+
+.item[no-lines] {
+  &:before,
+  &:after {
+    border-width: 0;
+  }
+
+  + .item:before {
+    border-width: 0;
+  }
+}
diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss
index 3962c8f552..b42f9f42e6 100644
--- a/ionic/components/item/modes/md.scss
+++ b/ionic/components/item/modes/md.scss
@@ -254,3 +254,14 @@ button.item {
     box-shadow: none;
   }
 }
+
+.item[no-lines] {
+  &:before,
+  &:after {
+    border-width: 0;
+  }
+
+  + .item:before {
+    border-width: 0;
+  }
+}
diff --git a/ionic/components/item/test/text/main.html b/ionic/components/item/test/text/main.html
index e7457eb7ba..dd050f4a91 100644
--- a/ionic/components/item/test/text/main.html
+++ b/ionic/components/item/test/text/main.html
@@ -12,9 +12,13 @@
       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 text-wrap>
       Multiline text that should wrap when it is too long
-      to fit on one line in the item. Class on .item
+      to fit on one line in the item. Attribute on .item
     </ion-item>
 
     <ion-item text-wrap>