Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix dragging in i0S #2

Merged
merged 1 commit into from
Jan 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
654 changes: 415 additions & 239 deletions app/index.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions app/js/velocity.min.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions app/js/velocity.ui.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/js/velocity.min.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions dist/js/velocity.ui.min.js

Large diffs are not rendered by default.

22 changes: 17 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ gulp.task('sass', ['sass-compile', 'sass-watch']);

gulp.task('flickity-js', function() {
return gulp.src('node_modules/flickity/dist/flickity.pkgd.min.js')
.pipe(gulp.dest('app/js')) // Outputs it in the css folder
.pipe(gulp.dest('dist/js')) // Outputs it in the css folder
.pipe(gulp.dest('app/js')) // Outputs it in the js folder
.pipe(gulp.dest('dist/js')) // Outputs it in the js folder
})

gulp.task('flickity-css', function() {
Expand All @@ -51,11 +51,23 @@ gulp.task('flickity-css', function() {
.pipe(gulp.dest('dist/css')) // Outputs it in the css folder
})

gulp.task('velocity-js', function() {
return gulp.src('node_modules/velocity-animate/velocity.min.js')
.pipe(gulp.dest('app/js')) // Outputs it in the js folder
.pipe(gulp.dest('dist/js')) // Outputs it in the js folder
})

gulp.task('velocity-ui', function() {
return gulp.src('node_modules/velocity-animate/velocity.ui.min.js')
.pipe(gulp.dest('app/js')) // Outputs it in the js folder
.pipe(gulp.dest('dist/js')) // Outputs it in the js folder
})

// Watchers
gulp.task('watch', function() {
gulp.watch('app/sass/**/*.scss', ['sass']);
gulp.watch('app/*.html', browserSync.reload);
gulp.watch('app/js/**/*.js', browserSync.reload);
gulp.watch('app/*.html', browserSync.reload);
gulp.watch('app/js/**/*.js', browserSync.reload);
gulp.watch('app/css/*.css', ['sass-watch']);
})

Expand All @@ -64,4 +76,4 @@ gulp.task('default', function(callback) {
runSequence(['sass', 'browserSync', 'watch'],
callback
)
})
})