Skip to content

Commit

Permalink
fix(item): change ion-item-swiping to use .item-wrapper css instead
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed Jun 9, 2016
1 parent e5473b6 commit 31f62e7
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/components/card/card.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ion-card {
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/card/card.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ ion-card {
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/card/card.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ion-card {
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 0;
}

Expand Down
1 change: 1 addition & 0 deletions src/components/item/item-sliding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ export class ItemSliding {
constructor(@Optional() private _list: List, private _renderer: Renderer, private _elementRef: ElementRef) {
_list.enableSlidingItems(true);
_elementRef.nativeElement.$ionComponent = this;
_renderer.setElementClass(_elementRef.nativeElement, 'item-wrapper', true);
}


Expand Down
2 changes: 1 addition & 1 deletion src/components/item/item.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ ion-item-group {
}

.item:last-child .item-inner,
ion-item-sliding:last-child .item-inner {
.item-wrapper:last-child .item-inner {
border: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/item/item.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ ion-item-group {
}

.item:last-child .item-inner,
ion-item-sliding:last-child .item-inner {
.item-wrapper:last-child .item-inner {
border: 0;
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/components/list/list.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ ion-list {
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 1px solid $list-ios-border-color;
}

> .item:last-child,
> ion-item-sliding:last-child {
> .item-wrapper:last-child {
.item-inner {
border-bottom: 0;
}
Expand Down Expand Up @@ -126,7 +126,7 @@ ion-list + ion-list {
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom-width: $hairlines-width;
}
}
Expand Down Expand Up @@ -156,12 +156,12 @@ ion-list[inset] {
}

> .item:first-child,
> ion-item-sliding:first-child .item {
> .item-wrapper:first-child .item {
border-top: 0;
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/list/list.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ ion-list {
}

> .item:first-child,
> ion-item-sliding:first-child .item {
> .item-wrapper:first-child .item {
border-top: 1px solid $list-md-border-color;
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 1px solid $list-md-border-color;
}

> .item:last-child,
> ion-item-sliding:last-child {
> .item-wrapper:last-child {
ion-label,
.item-inner {
border-bottom: 0;
Expand Down
6 changes: 3 additions & 3 deletions src/components/list/list.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ ion-list {
}

> .item:first-child,
> ion-item-sliding:first-child .item {
> .item-wrapper:first-child .item {
border-top: 1px solid $list-wp-border-color;
}

> .item:last-child,
> ion-item-sliding:last-child .item {
> .item-wrapper:last-child .item {
border-bottom: 1px solid $list-wp-border-color;
}

> .item:last-child,
> ion-item-sliding:last-child {
> .item-wrapper:last-child {
ion-label,
.item-inner {
border-bottom: 0;
Expand Down

0 comments on commit 31f62e7

Please sign in to comment.