From 6827adb2818269fdb60ed77f544a387269742d2b Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 30 Oct 2015 16:02:04 -0400 Subject: [PATCH] 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 @@ + +List Cards + + + + + + + + + List Header + + + + + Wifi + + + + + Affection + + Very Little + + + + + + Home + + Where the heart is + + + + + + + + +