From f1f806da7c3f889e5e24c0ad57004ea94cf2eed2 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 17 Nov 2015 15:13:15 -0500 Subject: [PATCH 1/2] fix(item): fixed margin right for avatars and thumbnails for md mode fixes #557 --- ionic/components/item/modes/md.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 8adbc1a99b..7edaa23371 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -154,6 +154,16 @@ icon[item-left] + [text-input] { margin-left: $item-md-padding-left + ($item-md-padding-left / 2); } +ion-avatar[item-left], +ion-thumbnail[item-left] { + margin: ($item-md-padding-right / 2) $item-md-padding-right ($item-md-padding-right / 2) 0; +} + +ion-avatar[item-right], +ion-thumbnail[item-right] { + margin: ($item-md-padding-right / 2); +} + ion-avatar { min-width: $item-md-avatar-size; min-height: $item-md-avatar-size; From 616a52f6e0edf6a7aabae055997de7dc4ca1372a Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 17 Nov 2015 15:20:20 -0500 Subject: [PATCH 2/2] refactor(item-group): change css selectors from classes to elements references #568 --- ionic/components/item/item.scss | 4 ++-- ionic/components/item/modes/ios.scss | 4 ++-- ionic/components/item/modes/md.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index ad2822a028..3f95d63b10 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -36,11 +36,11 @@ align-self: stretch; } -.item-group { +ion-item-group { display: block; } -.item-group-title { +ion-item-group-title { display: block; min-height: 30px; font-weight: 500; diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index 24cd141de4..cf94ea37ca 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -30,7 +30,7 @@ $item-ios-sliding-content-bg: $background-color !default; $item-ios-sliding-transition: transform 250ms ease-in-out !default; -.item-group { +ion-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; @@ -166,7 +166,7 @@ a.item:not([detail-none]) .item-inner, &.hairlines { .item-inner, - .item-group ion-item-group-title { + ion-item-group ion-item-group-title { border-bottom-width: 0.55px; } } diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 7edaa23371..911af00569 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -32,7 +32,7 @@ $item-md-sliding-content-bg: $background-color !default; $item-md-sliding-transition: transform 250ms ease-in-out !default; -.item-group-title { +ion-item-group-title { padding: $item-md-padding-top $item-md-padding-right $item-md-padding-bottom $item-md-padding-left; background-color: $item-md-divider-bg; color: $item-md-divider-color;