Close GH-337: Remove unnecessary excludes and ignores.

yeoman · Apr 9, 2014 · 9cd81d9 · 9cd81d9
1 parent 2bad6da
commit 9cd81d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -236,9 +236,9 @@ module.exports = function (grunt) {
         // Automatically inject Bower components into the HTML file
         bowerInstall: {
             app: {
-                src: ['<%%= config.app %>/index.html'],<% if (includeSass) { %>
+                src: ['<%%= config.app %>/index.html']<% if (includeBootstrap) { %>,<% if (includeSass) { %>
                 exclude: ['bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap.js']<% } else { %>
-                exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } %>
+                exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } } %>
             }<% if (includeSass) { %>,
             sass: {
                 src: ['<%%= config.app %>/styles/{,*/}*.{scss,sass}']

diff --git a/app/templates/gitignore b/app/templates/gitignore
@@ -1,6 +1,6 @@
 node_modules
 dist
-.tmp
-.sass-cache
+.tmp<% if (includeSass) { %>
+.sass-cache<% } %>
 bower_components
 test/bower_components