From f9d1049029421030ae105f8d3486b48a05b2efa9 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 5 Nov 2015 19:40:07 -0500 Subject: [PATCH] fix(list): removing absolutely positioned border from md mode, added lines to radio references #437 --- ionic/components/item/item.scss | 1 + ionic/components/item/modes/md.scss | 50 ++++------------------------- ionic/components/radio/radio.ts | 14 ++++---- 3 files changed, 16 insertions(+), 49 deletions(-) diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index db5a78e643..966a0684b7 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -60,6 +60,7 @@ button.item.item { width: 100%; display: flex; align-items: center; + overflow: hidden; } ion-item-content { diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index 9f38858d62..6e1eabcc5f 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -44,50 +44,21 @@ ion-note { .list { .item-group { - // Make sure the first and last items don't have borders - > .item:first-of-type:before { - border-top: none !important; - } - > .item:last-of-type:after { - border-top: none !important; - } + } .item { margin-top: -1px; + border-top: 1px solid $item-md-border-color; padding-right: ($item-md-padding-right / 2); - padding-left: ($item-md-padding-left / 2); + margin-left: $item-md-padding-left; font-size: $item-md-font-size; text-transform: none; - - &:before { - position: absolute; - top: 0; - right: 0; - left: $item-md-padding-left; - border-top: 1px solid $item-md-border-color; - content: ''; - pointer-events: none; - } - - &:after { - position: absolute; - right: 0; - bottom: 0; - left: $item-md-padding-left; - border-top: 1px solid $item-md-border-color; - content: ''; - pointer-events: none; - } - - &:first-child:before, - &:last-child:after { - left: 0; - } } - ion-header + .item:before { - left: 0; + ion-header + .item { + margin-left: 0; + padding-left: $item-md-padding-left; } ion-item-content { @@ -240,12 +211,5 @@ button.item.activated { } .item[no-lines] { - &:before, - &:after { - border-width: 0; - } - - + .item:before { - border-width: 0; - } + border-width: 0; } diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts index f1f36b3e43..ee055f7550 100644 --- a/ionic/components/radio/radio.ts +++ b/ionic/components/radio/radio.ts @@ -182,12 +182,14 @@ export class RadioGroup extends Ion { '(click)': 'click($event)' }, template: - '' + - '' + - '' + - '' + - '' + - '' + '
' + + '' + + '' + + '' + + '' + + '' + + '' + + '
' }) export class RadioButton extends Ion { /**