From 2303c16fee03a20e659f1128d58b5ba026292496 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Mon, 27 Jun 2016 20:00:46 +0200 Subject: [PATCH] fix(item): sliding item works with and without borders closes #7081 --- src/components/item/item-sliding.scss | 11 ++++------- src/components/item/test/sliding/main.html | 2 +- src/components/list/list.ios.scss | 1 + src/components/list/list.md.scss | 5 +++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/item/item-sliding.scss b/src/components/item/item-sliding.scss index 1165415f380..992c18a621c 100644 --- a/src/components/item/item-sliding.scss +++ b/src/components/item/item-sliding.scss @@ -83,10 +83,14 @@ ion-item-sliding.active-slide { } &.active-options-left ion-item-options[side=left] { + width: 100%; + visibility: visible; } &.active-options-right ion-item-options:not([side=left]) { + width: 100%; + visibility: visible; } } @@ -102,13 +106,6 @@ ion-item-sliding.active-slide { transition-timing-function: cubic-bezier(.65, .05, .36, 1); } -ion-item-sliding.active-swipe-right, -ion-item-sliding.active-swipe-left { - ion-item-options { - width: 100%; - } -} - ion-item-sliding.active-swipe-right .button-expandable { order: 1; diff --git a/src/components/item/test/sliding/main.html b/src/components/item/test/sliding/main.html index 41e3551c022..8dd67247f43 100644 --- a/src/components/item/test/sliding/main.html +++ b/src/components/item/test/sliding/main.html @@ -221,7 +221,7 @@

Normal button (no sliding)

- +

ng-for {{data}}

diff --git a/src/components/list/list.ios.scss b/src/components/list/list.ios.scss index 39a22309f10..2e03d5ec947 100644 --- a/src/components/list/list.ios.scss +++ b/src/components/list/list.ios.scss @@ -182,6 +182,7 @@ ion-list[inset] + ion-list[inset] { ion-list[no-lines], &.hairlines ion-list[no-lines] { ion-list-header, + ion-item-options, .item, .item .item-inner { border-width: 0; diff --git a/src/components/list/list.md.scss b/src/components/list/list.md.scss index d9de0893672..200f517c833 100644 --- a/src/components/list/list.md.scss +++ b/src/components/list/list.md.scss @@ -63,6 +63,10 @@ ion-list { left: 0; } + ion-item-options { + border-bottom: 1px solid $list-md-border-color; + } + ion-item-options button, ion-item-options [button] { display: inline-flex; @@ -143,6 +147,7 @@ ion-list[inset] { ion-list[no-lines] { .item, + ion-item-options, .item .item-inner { border-width: 0; }