fix(app): fixed bootstrap css being imported rather than compass boot…

…strap bower-install and wiredep will now exclude bootstrap dependencies if compass bootstrap is selected, because bootstrap is imported in the main.scss file. This is to prevent a double inclusion of bootstrap.css
angular-fullstack · Jan 17, 2014 · f273998 · f273998
1 parent 9950682
commit f273998
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/app/index.js b/app/index.js
@@ -445,26 +445,26 @@ Generator.prototype._injectDependencies = function _injectDependencies() {
     '\n' +
     chalk.yellow.bold('\n  grunt bower-install');
 
+  var wireDepConfig = {
+    directory: 'app/bower_components',
+    bowerJson: JSON.parse(fs.readFileSync('./bower.json')),
+    ignorePath: 'app/',
+    htmlFile: 'app/views/index.html',
+    cssPattern: '<link rel="stylesheet" href="{{filePath}}">'
+  };
+
+  if (this.jade) {
+    wireDepConfig.htmlFile = 'app/views/index.jade';
+  }
+
+  if (this.compass && this.bootstrap) {
+    wireDepConfig.exclude = ['sass-bootstrap'];
+  }
+
   if (this.options['skip-install']) {
     console.log(howToInstall);
   } else {
-    if (this.jade) {
-      wiredep({
-        directory: 'app/bower_components',
-        bowerJson: JSON.parse(fs.readFileSync('./bower.json')),
-        ignorePath: 'app/',
-        htmlFile: 'app/views/index.jade',
-        cssPattern: '<link rel="stylesheet" href="{{filePath}}">'
-      });
-    } else {
-      wiredep({
-        directory: 'app/bower_components',
-        bowerJson: JSON.parse(fs.readFileSync('./bower.json')),
-        ignorePath: 'app/',
-        htmlFile: 'app/views/index.html',
-        cssPattern: '<link rel="stylesheet" href="{{filePath}}">'
-      });
-    }
+    wiredep(wireDepConfig);
   }
 };
 

diff --git a/app/templates/styles/main.scss b/app/templates/styles/main.scss
@@ -1,5 +1,7 @@
 <% if (compassBootstrap) { %>$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
 
+@import 'sass-bootstrap/lib/bootstrap';
+
 <% } %>.browsehappy {
     margin: 0.2em 0;
     background: #ccc;

diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
@@ -171,7 +171,8 @@ module.exports = function (grunt) {
       app: {<% if (jade) { %>
         html: '<%%= yeoman.app %>/views/index.jade',<% } else { %>
         html: '<%%= yeoman.app %>/views/index.html',<% } %>
-        ignorePath: '<%%= yeoman.app %>/'
+        ignorePath: '<%%= yeoman.app %>/'<% if (compass && bootstrap) { %>,
+        exclude: ['sass-bootstrap']<% } %>
       }
     },<% if (coffee) { %>