Skip to content

Commit

Permalink
fix(item): sliding item works with and without borders
Browse files Browse the repository at this point in the history
closes #7081
  • Loading branch information
manucorporat committed Jun 27, 2016
1 parent 19a8670 commit 2303c16
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
11 changes: 4 additions & 7 deletions src/components/item/item-sliding.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/components/item/test/sliding/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ <h2>Normal button (no sliding)</h2>
</ion-list>


<ion-list>
<ion-list no-lines>
<ion-item-sliding *ngFor="let data of items" #item9>
<ion-item text-wrap detail-push>
<h3>ng-for {{data}}</h3>
Expand Down
1 change: 1 addition & 0 deletions src/components/list/list.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/components/list/list.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -143,6 +147,7 @@ ion-list[inset] {

ion-list[no-lines] {
.item,
ion-item-options,
.item .item-inner {
border-width: 0;
}
Expand Down

0 comments on commit 2303c16

Please sign in to comment.