Merge pull request #485 from jmcarp/feature/serve-shared-images

Serve images from fec-style.
fecgov · Aug 18, 2015 · 8731e3c · 8731e3c
2 parents b04a8e2 + 12d8960
commit 8731e3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,10 +7,8 @@ node_modules
 .sass-cache/
 rev-manifest.json
 openfecwebapp/local_config.py
-static/images
 app/
 /.env
 .DS_Store
 
 dist
-static/styles/styles.css
diff --git a/gulpfile.js b/gulpfile.js
@@ -31,12 +31,12 @@ gulp.task('copy-vendor-images', function() {
 
 gulp.task('copy-fonts', function() {
   return gulp.src('./static/fonts/**/*')
-  .pipe(gulp.dest('./dist/fonts'));
+    .pipe(gulp.dest('./dist/fonts'));
 });
 
 gulp.task('copy-images', function() {
-  return gulp.src('./static/img/**/*')
-  .pipe(gulp.dest('./dist/img'));
+  return gulp.src(['./static/img/**/*', './node_modules/fec-style/img/**/*'])
+    .pipe(gulp.dest('./dist/img'));
 });
 
 gulp.task('build-sass', ['copy-vendor-images', 'copy-fonts', 'copy-images'], function() {