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

fix(card): removed duplicate item css in the card and removed the border for now

Browse Source 
references #387
This commit is contained in:
Brandy Carney
2015-11-16 19:12:17 -05:00
parent 8b4e528732
commit e5553e5f05
2 changed files with 6 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,11 @@ ion-card {
} }
.item { .item {
padding-left: ($card-ios-padding-left / 2); padding-left: $card-ios-padding-left / 2;
padding-right: ($card-ios-padding-right / 2);
font-size: $item-ios-font-size;
} }
ion-item-content { .item-inner {
padding: $card-ios-padding-top ($card-ios-padding-right / 2) $card-ios-padding-bottom ($card-ios-padding-left / 2); border: none;
} }
ion-card-content { ion-card-content {
@ -89,28 +87,13 @@ ion-card {
button, button,
[button] { [button] {
margin: $item-ios-padding-icon-top ($item-ios-padding-right / 2) $item-ios-padding-icon-bottom ($item-ios-padding-left / 2); margin: 0 ($item-ios-padding-right / 2);
padding: 2px 6px; padding: 2px 6px;
min-height: 26px; min-height: 26px;
font-size: 1.3rem; font-size: 1.3rem;
} }
} }
[item-left],
[item-right] {
margin: $card-ios-padding-media-top ($card-ios-padding-right / 2) $card-ios-padding-media-bottom ($card-ios-padding-left / 2);
}
button[item-left],
button[item-right],
[button][item-left],
[button][item-right], {
margin: $item-ios-padding-icon-top ($item-ios-padding-right / 2) $item-ios-padding-icon-bottom ($item-ios-padding-left / 2);
padding: 2px 6px;
min-height: 26px;
font-size: 1.3rem;
}
ion-note[item-left], ion-note[item-left],
ion-note[item-right], { ion-note[item-right], {
font-size: 1.3rem; font-size: 1.3rem;
@ -122,25 +105,6 @@ ion-card {
color: $card-ios-title-text-color; color: $card-ios-title-text-color;
} }
ion-avatar {
min-width: $item-ios-avatar-size;
img {
max-width: $item-ios-avatar-size;
max-height: $item-ios-avatar-size;
border-radius: $item-ios-avatar-size / 2;
}
}
ion-thumbnail {
min-width: $item-ios-thumbnail-size;
img {
max-width: $item-ios-thumbnail-size;
max-height: $item-ios-thumbnail-size;
}
}
h1 { h1 {
margin: 0 0 2px; margin: 0 0 2px;
font-size: 2.4rem; font-size: 2.4rem;

40
ionic/components/card/modes/md.scss
View File

@ -52,13 +52,11 @@ ion-card {
} }
.item { .item {
padding-right: ($card-md-padding-right / 2);
padding-left: ($card-md-padding-left / 2);
font-size: $item-md-font-size; font-size: $item-md-font-size;
} }
ion-item-content { .item-inner {
padding: $card-md-padding-top ($card-md-padding-right / 2) $card-md-padding-bottom ($card-md-padding-left / 2); border: none;
} }
ion-card-content { ion-card-content {
@ -88,21 +86,6 @@ ion-card {
} }
} }
[item-left],
[item-right] {
margin: $card-md-padding-media-top ($card-md-padding-right / 2) $card-md-padding-media-bottom ($card-md-padding-left / 2);
}
button[item-left],
button[item-right],
[button][item-left],
[button][item-right], {
margin: 0 ($card-md-padding-right / 4) 0 ($card-md-padding-left / 4);
min-height: 26px;
font-size: 1.3rem;
border-color: transparent;
}
ion-note[item-left], ion-note[item-left],
ion-note[item-right], { ion-note[item-right], {
font-size: 1.3rem; font-size: 1.3rem;
@ -114,25 +97,6 @@ ion-card {
color: $card-md-title-text-color; color: $card-md-title-text-color;
} }
ion-avatar {
min-width: $card-md-avatar-size;
img {
max-width: $card-md-avatar-size;
max-height: $card-md-avatar-size;
border-radius: $card-md-avatar-size / 2;
}
}
ion-thumbnail {
min-width: $card-md-thumbnail-size;
img {
max-width: $card-md-thumbnail-size;
max-height: $card-md-thumbnail-size;
}
}
h1 { h1 {
margin: 0 0 2px; margin: 0 0 2px;
font-size: 2.4rem; font-size: 2.4rem;