Merge branch 'master' into alpha38

This commit is contained in:
Adam Bradley
2015-10-06 11:15:20 -05:00
3 changed files with 14 additions and 3 deletions

View File

@ -354,6 +354,17 @@ gulp.task('copy.web-animations', function() {
.pipe(gulp.dest('dist/js'));
})
gulp.task('src.link', function(done) {
watch(['/ionic/**/*.ts', 'ionic/**/*.scss'], function(file) {
gulp.start('src');
});
watch('demos/**/*', function() {
gulp.start('demos:all');
});
})
gulp.task('src', function(done){
runSequence(
'clean',

View File

@ -7,7 +7,7 @@ import {App} from 'ionic/ionic';
class IonicApp {
constructor() {
this.people = [
{"name": "Adam Bradley", "components": [ "app", "badge", "button", "card"]},
{"name": "Adam Bradley", "components": [ "all the things"]},
{"name": "Max Lynch", "components": [ "checkbox", "content", "form"]},
{"name": "Tim Lancina", "components": [ "tabs"]}
];

View File

@ -1,13 +1,13 @@
<ion-toolbar><ion-title>List Headers Borders</ion-title></ion-toolbar>
<ion-content>
<ion-content class="outer-content">
<ion-list class="outer-content" *ng-for="#person of people">
<ion-header>
{{person.name}}
</ion-header>
<ion-item *ng-for="#component of person.components">
<span>{{component}}</span>
{{component}}
<div item-right>
<icon pin></icon>
</div>