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 'list-border-refactor'

Browse Source
This commit is contained in:
Brandy Carney
2015-11-17 15:22:05 -05:00
parent a4a6b5d8e3 616a52f6e0
commit 1c9d8c22b1
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,11 +36,11 @@
align-self: stretch;
}
.item-group {
ion-item-group {
display: block;
}
.item-group-title {
ion-item-group-title {
display: block;
min-height: 30px;
font-weight: 500;

4
ionic/components/item/modes/ios.scss
View File

@@ -30,7 +30,7 @@ $item-ios-sliding-content-bg: $background-color !default;
$item-ios-sliding-transition: transform 250ms ease-in-out !default;
.item-group {
ion-item-group {
ion-item-group-title {
padding: $item-ios-padding-top $item-ios-padding-right $item-ios-padding-bottom $item-ios-padding-left;
background-color: $item-ios-divider-bg;
@@ -166,7 +166,7 @@ a.item:not([detail-none]) .item-inner,
&.hairlines {
.item-inner,
.item-group ion-item-group-title {
ion-item-group ion-item-group-title {
border-bottom-width: 0.55px;
}
}

12
ionic/components/item/modes/md.scss
View File

@@ -32,7 +32,7 @@ $item-md-sliding-content-bg: $background-color !default;
$item-md-sliding-transition: transform 250ms ease-in-out !default;
.item-group-title {
ion-item-group-title {
padding: $item-md-padding-top $item-md-padding-right $item-md-padding-bottom $item-md-padding-left;
background-color: $item-md-divider-bg;
color: $item-md-divider-color;
@@ -154,6 +154,16 @@ icon[item-left] + [text-input] {
margin-left: $item-md-padding-left + ($item-md-padding-left / 2);
}
ion-avatar[item-left],
ion-thumbnail[item-left] {
margin: ($item-md-padding-right / 2) $item-md-padding-right ($item-md-padding-right / 2) 0;
}
ion-avatar[item-right],
ion-thumbnail[item-right] {
margin: ($item-md-padding-right / 2);
}
ion-avatar {
min-width: $item-md-avatar-size;
min-height: $item-md-avatar-size;