javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

card updates

Browse Source
This commit is contained in:
Adam Bradley
2015-08-31 14:47:30 -05:00
parent ae20464484
commit 7fc18380d2
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/components/card/modes/ios.scss
View File

@ -43,6 +43,7 @@ ion-card[mode=ios] {
.item { .item {
padding-right: ($card-ios-padding-right / 2); padding-right: ($card-ios-padding-right / 2);
padding-left: ($card-ios-padding-left / 2); padding-left: ($card-ios-padding-left / 2);
font-size: $item-ios-font-size;
} }
ion-item-content { ion-item-content {
@ -52,6 +53,7 @@ ion-card[mode=ios] {
ion-card-content { ion-card-content {
padding: $card-ios-padding-top $card-ios-padding-right $card-ios-padding-bottom $card-ios-padding-left; padding: $card-ios-padding-top $card-ios-padding-right $card-ios-padding-bottom $card-ios-padding-left;
font-size: $card-ios-font-size; font-size: $card-ios-font-size;
line-height: 1.4;
} }
ion-card-header { ion-card-header {
@ -61,6 +63,11 @@ ion-card[mode=ios] {
color: $card-ios-header-color; color: $card-ios-header-color;
} }
ion-card-header + ion-card-content,
.item + ion-card-content {
padding-top: 0;
}
[item-left], [item-left],
[item-right] { [item-right] {
margin: $card-ios-padding-media-top ($card-ios-padding-right / 2) $card-ios-padding-media-bottom ($card-ios-padding-left / 2); margin: $card-ios-padding-media-top ($card-ios-padding-right / 2) $card-ios-padding-media-bottom ($card-ios-padding-left / 2);
@ -76,6 +83,11 @@ ion-card[mode=ios] {
font-size: 1.3rem; font-size: 1.3rem;
} }
icon[forward] {
font-size: 2rem;
color: $item-ios-forward-icon-color;
}
.card-title { .card-title {
padding: $card-ios-title-padding; padding: $card-ios-title-padding;
font-size: $card-ios-title-font-size; font-size: $card-ios-title-font-size;
@ -117,7 +129,6 @@ ion-card[mode=ios] {
p { p {
font-size: 1.4rem; font-size: 1.4rem;
margin: 0 0 2px; margin: 0 0 2px;
line-height: 1.5;
color: $card-ios-text-color; color: $card-ios-text-color;
} }

7
ionic/components/card/modes/material.scss
View File

@ -46,6 +46,7 @@ ion-card[mode=md] {
.item { .item {
padding-right: ($card-md-padding-right / 2); padding-right: ($card-md-padding-right / 2);
padding-left: ($card-md-padding-left / 2); padding-left: ($card-md-padding-left / 2);
font-size: $item-md-font-size;
} }
ion-item-content { ion-item-content {
@ -64,6 +65,11 @@ ion-card[mode=md] {
color: $card-md-header-color; color: $card-md-header-color;
} }
ion-card-header + ion-card-content,
.item + ion-card-content {
padding-top: 0;
}
[item-left], [item-left],
[item-right] { [item-right] {
margin: $card-md-padding-media-top ($card-md-padding-right / 2) $card-md-padding-media-bottom ($card-md-padding-left / 2); margin: $card-md-padding-media-top ($card-md-padding-right / 2) $card-md-padding-media-bottom ($card-md-padding-left / 2);
@ -77,6 +83,7 @@ ion-card[mode=md] {
padding: 2px 6px; padding: 2px 6px;
min-height: 26px; min-height: 26px;
font-size: 1.3rem; font-size: 1.3rem;
border-color: transparent;
} }
.card-title { .card-title {

2
ionic/ionic.material.scss
View File

@ -6,10 +6,10 @@
"components/toolbar/modes/material", "components/toolbar/modes/material",
"components/action-menu/modes/material", "components/action-menu/modes/material",
"components/button/modes/material", "components/button/modes/material",
"components/card/modes/material",
"components/checkbox/modes/material", "components/checkbox/modes/material",
"components/item/modes/material", "components/item/modes/material",
"components/list/modes/material", "components/list/modes/material",
"components/card/modes/material",
"components/text-input/modes/material", "components/text-input/modes/material",
"components/nav-bar/modes/material", "components/nav-bar/modes/material",
"components/radio/modes/material", "components/radio/modes/material",