Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack

Author: DaftMonk

app/templates/styles/main.scss

@@ -1,6 +1,6 @@
-<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
+<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass/fonts/";
 
-@import 'sass-bootstrap/lib/bootstrap';
+@import 'bootstrap-sass/lib/bootstrap';
 
 <% } %>.browsehappy {
     margin: 0.2em 0;

templates/common/Gruntfile.js

@@ -172,7 +172,7 @@ module.exports = function (grunt) {
         html: '<%%= yeoman.app %>/views/index.jade',<% } else { %>
         html: '<%%= yeoman.app %>/views/index.html',<% } %>
         ignorePath: '<%%= yeoman.app %>/'<% if (compass && bootstrap) { %>,
-        exclude: ['sass-bootstrap']<% } %>
+        exclude: ['bootstrap-sass']<% } %>
       }
     },<% if (coffee) { %>
 
@@ -300,7 +300,7 @@ module.exports = function (grunt) {
         files: [{
           expand: true,
           cwd: '<%%= yeoman.app %>/views',
-          src: ['*.html', 'partials/*.html'],
+          src: ['*.html', 'partials/**/*.html'],
           dest: '<%%= yeoman.dist %>/views'
         }]
       }

templates/common/_bower.json

@@ -6,7 +6,7 @@
     "json3": "~3.2.6",
     "es5-shim": "~2.1.0"<% if (bootstrap) { %>,
     "jquery": "~1.10.2"<% if (compassBootstrap) { %>,
-    "sass-bootstrap": "~3.0.2"<% } else { %>,
+    "bootstrap-sass": "~3.0.2"<% } else { %>,
     "bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>,
     "angular-resource": "1.2.6"<% } %><% if (cookiesModule) { %>,
     "angular-cookies": "1.2.6"<% } %><% if (sanitizeModule) { %>,