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

Merge branch 'master' into list-border-refactor

Browse Source
This commit is contained in:
Brandy Carney
2015-11-16 14:16:07 -05:00
parent 609e827764 b5fc40be92
commit 301bc3b05d
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ionic/components/list/modes/ios.scss
View File

@@ -207,13 +207,6 @@ ion-card {
ion-item-options {
border-width: 0.55px;
//
// button, [button] {
// min-height: calc(100% - 1px);
// height: calc(100% - 1px);
// margin-top: 0.55px;
// margin-bottom: 0.55px;
// }
}
ion-header,
@@ -222,8 +215,6 @@ ion-card {
}
.item {
margin-top: -0.55px;
.item-inner {
border-width: 0.55px;
}
@@ -236,7 +227,6 @@ ion-card {
> .item:last-child,
> ion-item-sliding:last-child .item {
border-bottom-width: 0.55px;
margin-bottom: -0.55px;
}
}

4
ionic/components/list/modes/md.scss
View File

@@ -73,7 +73,7 @@ $list-md-header-color: #858585 !default;
[item-left],
[item-right] {
margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom ($item-md-padding-left / 2);
margin: $item-md-padding-media-top ($item-md-padding-right / 2) $item-md-padding-media-bottom 0;
}
icon[item-left],
@@ -261,8 +261,6 @@ $list-md-header-color: #858585 !default;
/*****************/
.list[no-lines] {
ion-header,
ion-item-group-title,
.item,
.item .item-inner {
border-width: 0;