mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-18 19:21:34 +08:00
Merge branch 'master' into alpha38
This commit is contained in:
11
gulpfile.js
11
gulpfile.js
@ -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',
|
||||
|
@ -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"]}
|
||||
];
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user