Skip to content

Commit

Permalink
Merge branch 'js'
Browse files Browse the repository at this point in the history
  • Loading branch information
sinedied committed Mar 9, 2016
2 parents f3db82b + 7602a90 commit 2caf2f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ node_modules/
/dist/
.sass-cache
.idea/
.npm-debug.log
npm-debug.log

## Karma
/reports/
Expand Down
3 changes: 2 additions & 1 deletion docs/tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ translations:extract | Extract Messages from Code and Templates to template.pot.
Task | Description
------------|---------------------------------------------------------------------------------------------------------
typescript | Convert all *.ts found in project to js in the temporary folder.
tsd | Download all TypeScript definitions for Bower dependencies.
tsd | Download and update all TypeScript definitions for Bower dependencies.
tsd:restore | Download TypeScript definitions according to tsd.json
tsd:clean | Delete downloaded TypeScript definitions.

## HTML / Jade
Expand Down
2 changes: 1 addition & 1 deletion gulp/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ gulp.task('other', ['fonts'], function() {
gulp.task('build', ['build:sources', 'other', 'images']);

gulp.task('clean', ['images:clean-cache'], function() {
return $.del([path.join(conf.paths.dist, '/'), path.join(conf.paths.tmp, '/')]);
return $.del([conf.paths.dist, conf.paths.tmp]);
});

0 comments on commit 2caf2f1

Please sign in to comment.