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

remove .item-media

Browse Source
This commit is contained in:
Adam Bradley
2015-09-18 11:25:39 -05:00
parent d8b1bab715
commit b95e9609cb
8 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/sink/pages/card.ts
View File

@ -24,10 +24,8 @@ import {SinkPage} from '../sink-page';
Card Header Card Header
</ion-card-header> </ion-card-header>
<div class="item"> <div>
<div class="item-media"> <img src="http://i.imgur.com/7BEPcGo.jpg">
<img src="http://i.imgur.com/7BEPcGo.jpg">
</div>
</div> </div>
</ion-card> </ion-card>

2
ionic/components/checkbox/checkbox.ts
View File

@ -46,7 +46,7 @@ import {IonicComponent, IonicView} from '../../config/annotations';
}) })
@IonicView({ @IonicView({
template: template:
'<div item-left class="item-media media-checkbox">' + '<div item-left class="media-checkbox">' +
'<div class="checkbox-icon"></div>' + '<div class="checkbox-icon"></div>' +
'</div>' + '</div>' +
'<ion-item-content id="{{labelId}}">' + '<ion-item-content id="{{labelId}}">' +

8
ionic/components/item/item-media.scss
View File

@ -26,14 +26,6 @@
} }
} }
.item .item-media {
line-height: 1;
img {
display: block;
}
}
ion-avatar, ion-avatar,
ion-thumbnail { ion-thumbnail {
display: block; display: block;

6
ionic/components/item/test/media/main.html
View File

@ -55,9 +55,9 @@
</ion-item> </ion-item>
<button ion-item> <button ion-item>
<div class="item-media" item-left> <ion-thumbnail item-left>
<img class="thumbnail" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw=="> <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
</div> </ion-thumbnail>
<h3>H3 Title Text</h3> <h3>H3 Title Text</h3>
<p>Icon on right</p> <p>Icon on right</p>
<p>Vertically align top</p> <p>Vertically align top</p>

2
ionic/components/radio/radio.ts
View File

@ -189,7 +189,7 @@ export class RadioGroup extends Ion {
'<ion-item-content id="{{labelId}}">' + '<ion-item-content id="{{labelId}}">' +
'<ng-content></ng-content>' + '<ng-content></ng-content>' +
'</ion-item-content>' + '</ion-item-content>' +
'<div item-right class="item-media media-radio">' + '<div item-right class="media-radio">' +
'<div class="radio-icon"></div>' + '<div class="radio-icon"></div>' +
'</div>' '</div>'
}) })

2
ionic/components/switch/modes/ios.scss
View File

@ -24,7 +24,7 @@ $switch-ios-transition-duration: 300ms !default;
ion-switch { ion-switch {
.item-media.media-switch { [item-right].media-switch {
margin: 0; margin: 0;
padding: 6px ($item-ios-padding-right / 2) 6px ($item-ios-padding-left); padding: 6px ($item-ios-padding-right / 2) 6px ($item-ios-padding-left);
} }

2
ionic/components/switch/modes/md.scss
View File

@ -20,7 +20,7 @@ $switch-md-transition-duration: 300ms !default;
ion-switch { ion-switch {
.item-media.media-switch { [item-right].media-switch {
margin: 0; margin: 0;
padding: 6px ($item-md-padding-right / 2) 6px $item-md-padding-left; padding: 6px ($item-md-padding-right / 2) 6px $item-md-padding-left;
} }

2
ionic/components/switch/switch.ts
View File

@ -107,7 +107,7 @@ class MediaSwitch {
'<ion-item-content id="{{labelId}}">' + '<ion-item-content id="{{labelId}}">' +
'<ng-content></ng-content>' + '<ng-content></ng-content>' +
'</ion-item-content>' + '</ion-item-content>' +
'<div item-right class="item-media media-switch">' + '<div item-right class="media-switch">' +
'<div class="switch-icon"></div>' + '<div class="switch-icon"></div>' +
'</div>', '</div>',
directives: [MediaSwitch] directives: [MediaSwitch]