diff --git a/gulpfile.js b/gulpfile.js index 0d6ad42a..cd6bfea4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,7 +63,7 @@ gulp.task('js:build', function() { bundle(false); }); -gulp.task('serve', ['browser-sync', 'run-server', 'sass:build', 'sass:watch', 'copy'], function() { +gulp.task('serve', ['browser-sync', 'run-server', 'lint:watch', 'sass:build', 'sass:watch', 'copy'], function() { bundle(true); }); diff --git a/img/ascribe_animated_large.gif b/img/ascribe_animated_large.gif new file mode 100644 index 00000000..bb3c620d Binary files /dev/null and b/img/ascribe_animated_large.gif differ diff --git a/img/ascribe_animated_medium.gif b/img/ascribe_animated_medium.gif new file mode 100644 index 00000000..2b3994b6 Binary files /dev/null and b/img/ascribe_animated_medium.gif differ diff --git a/img/ascribe_animated_small.gif b/img/ascribe_animated_small.gif new file mode 100644 index 00000000..7d249c1e Binary files /dev/null and b/img/ascribe_animated_small.gif differ diff --git a/js/components/ascribe_buttons/delete_button.js b/js/components/ascribe_buttons/delete_button.js index 0d37a236..0c34dbd2 100644 --- a/js/components/ascribe_buttons/delete_button.js +++ b/js/components/ascribe_buttons/delete_button.js @@ -48,7 +48,7 @@ let DeleteButton = React.createClass({ btnDelete = ; } else{ - return
; + return null; } return (