javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(item): added margin back in for ion-item-content and removed button tests and actions

Browse Source 
references #279
This commit is contained in:
Brandy Carney
2016-01-05 15:23:55 -05:00
parent 02dd3b2760
commit d0b71096c8
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ionic/components/item/item.ios.scss
View File

@ -81,11 +81,10 @@ $item-ios-sliding-content-bg: $list-ios-background-color !default;
.item-inner { .item-inner {
padding-right: ($item-ios-padding-right / 2); padding-right: ($item-ios-padding-right / 2);
border-bottom: 1px solid $list-ios-border-color; border-bottom: 1px solid $list-ios-border-color;
min-height: 44px;
} }
[text-wrap] ion-item-content { ion-item-content {
padding: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0; margin: $item-ios-padding-top ($item-ios-padding-right / 2) $item-ios-padding-bottom 0;
} }
&.hairlines .item-inner { &.hairlines .item-inner {

6
ionic/components/item/item.scss
View File

@ -75,12 +75,6 @@ ion-item-content {
} }
} }
.item[actions] {
ion-item-content {
text-align: center;
}
}
[text-wrap] ion-item-content { [text-wrap] ion-item-content {
white-space: normal; white-space: normal;
} }

7
ionic/components/item/test/buttons/main.html
View File

@ -48,13 +48,6 @@
</button> </button>
</ion-item> </ion-item>
<ion-item actions>
<ion-item-content><button (click)="testClick($event)">Button 1</button></ion-item-content>
<ion-item-content><button (click)="testClick($event)">Button 2</button></ion-item-content>
<ion-item-content><button (click)="testClick($event)">Button 3</button></ion-item-content>
<ion-item-content><button (click)="testClick($event)">Button 4</button></ion-item-content>
</ion-item>
<ion-item> <ion-item>
<button clear item-left (click)="testClick($event)"> <button clear item-left (click)="testClick($event)">
<icon navigate></icon> <icon navigate></icon>