From 7634a3ad33332061e689d8ac1b96dcb744616272 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 29 Oct 2015 18:13:12 -0400 Subject: [PATCH] fix(card): moved the CSS for ion-note so that a note in a card will get the proper styling references #353 --- ionic/components/card/test/advanced/main.html | 7 +++---- ionic/components/card/test/basic/main.html | 2 +- ionic/components/item/modes/ios.scss | 8 ++++---- ionic/components/item/modes/md.scss | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ionic/components/card/test/advanced/main.html b/ionic/components/card/test/advanced/main.html index daf756d730..f0c343e007 100644 --- a/ionic/components/card/test/advanced/main.html +++ b/ionic/components/card/test/advanced/main.html @@ -60,10 +60,9 @@ Listen - + + Right Note + diff --git a/ionic/components/card/test/basic/main.html b/ionic/components/card/test/basic/main.html index 352d064718..547a1cbe9f 100644 --- a/ionic/components/card/test/basic/main.html +++ b/ionic/components/card/test/basic/main.html @@ -21,7 +21,7 @@ - ion-iteam in a card, icon left, button right + ion-item in a card, icon left, button right diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 4014bc2888..bc4c36f514 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -36,6 +36,10 @@ $item-ios-sliding-transition: transform 250ms ease-in-out !default; color: $item-ios-divider-color; } +ion-note { + color: $item-ios-note-color; +} + .list { .item-group { @@ -137,10 +141,6 @@ $item-ios-sliding-transition: transform 250ms ease-in-out !default; margin-bottom: 1px; } - ion-note { - color: $item-ios-note-color; - } - ion-avatar { min-width: $item-ios-avatar-size; min-height: $item-ios-avatar-size; diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index f616427b09..3962c8f552 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -38,6 +38,10 @@ $item-md-sliding-transition: transform 250ms ease-in-out !default; color: $item-md-divider-color; } +ion-note { + color: $item-md-note-color; +} + .list { .item-group { // Make sure the first and last items don't have borders @@ -140,10 +144,6 @@ $item-md-sliding-transition: transform 250ms ease-in-out !default; line-height: $item-md-body-text-line-height; } - ion-note { - color: $item-md-note-color; - } - .item[actions] ion-item-content { margin: 4px; }