javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 14:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(item): change ion-item-swiping to use .item-wrapper css instead

Browse Source
This commit is contained in:
Adam Bradley
2016-06-09 15:32:12 -05:00
parent e5473b6759
commit 31f62e7f1f
9 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/card/card.ios.scss
View File

@ -59,7 +59,7 @@ ion-card {
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 0; border-bottom: 0;
} }

2
src/components/card/card.md.scss
View File

@ -61,7 +61,7 @@ ion-card {
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 0; border-bottom: 0;
} }

2
src/components/card/card.wp.scss
View File

@ -62,7 +62,7 @@ ion-card {
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 0; border-bottom: 0;
} }

1
src/components/item/item-sliding.ts
View File

@ -197,6 +197,7 @@ export class ItemSliding {
constructor(@Optional() private _list: List, private _renderer: Renderer, private _elementRef: ElementRef) { constructor(@Optional() private _list: List, private _renderer: Renderer, private _elementRef: ElementRef) {
_list.enableSlidingItems(true); _list.enableSlidingItems(true);
_elementRef.nativeElement.$ionComponent = this; _elementRef.nativeElement.$ionComponent = this;
_renderer.setElementClass(_elementRef.nativeElement, 'item-wrapper', true);
} }

2
src/components/item/item.ios.scss
View File

@ -201,7 +201,7 @@ ion-item-group {
} }
.item:last-child .item-inner, .item:last-child .item-inner,
ion-item-sliding:last-child .item-inner { .item-wrapper:last-child .item-inner {
border: 0; border: 0;
} }
} }

2
src/components/item/item.md.scss
View File

@ -192,7 +192,7 @@ ion-item-group {
} }
.item:last-child .item-inner, .item:last-child .item-inner,
ion-item-sliding:last-child .item-inner { .item-wrapper:last-child .item-inner {
border: 0; border: 0;
} }
} }

10
src/components/list/list.ios.scss
View File

@ -47,12 +47,12 @@ ion-list {
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 1px solid $list-ios-border-color; border-bottom: 1px solid $list-ios-border-color;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child { > .item-wrapper:last-child {
.item-inner { .item-inner {
border-bottom: 0; border-bottom: 0;
} }
@ -126,7 +126,7 @@ ion-list + ion-list {
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom-width: $hairlines-width; border-bottom-width: $hairlines-width;
} }
} }
@ -156,12 +156,12 @@ ion-list[inset] {
} }
> .item:first-child, > .item:first-child,
> ion-item-sliding:first-child .item { > .item-wrapper:first-child .item {
border-top: 0; border-top: 0;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 0; border-bottom: 0;
} }
} }

6
src/components/list/list.md.scss
View File

@ -42,17 +42,17 @@ ion-list {
} }
> .item:first-child, > .item:first-child,
> ion-item-sliding:first-child .item { > .item-wrapper:first-child .item {
border-top: 1px solid $list-md-border-color; border-top: 1px solid $list-md-border-color;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 1px solid $list-md-border-color; border-bottom: 1px solid $list-md-border-color;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child { > .item-wrapper:last-child {
ion-label, ion-label,
.item-inner { .item-inner {
border-bottom: 0; border-bottom: 0;

6
src/components/list/list.wp.scss
View File

@ -42,17 +42,17 @@ ion-list {
} }
> .item:first-child, > .item:first-child,
> ion-item-sliding:first-child .item { > .item-wrapper:first-child .item {
border-top: 1px solid $list-wp-border-color; border-top: 1px solid $list-wp-border-color;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child .item { > .item-wrapper:last-child .item {
border-bottom: 1px solid $list-wp-border-color; border-bottom: 1px solid $list-wp-border-color;
} }
> .item:last-child, > .item:last-child,
> ion-item-sliding:last-child { > .item-wrapper:last-child {
ion-label, ion-label,
.item-inner { .item-inner {
border-bottom: 0; border-bottom: 0;