Close GH-351: Fix location for Bootstrap fonts with Sass and CSS.

yeoman · Apr 30, 2014 · 4c5a002 · 4c5a002
1 parent e1896ee
commit 4c5a002
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -360,11 +360,11 @@ module.exports = function (grunt) {
                 }<% if (includeBootstrap) { %>, {
                     expand: true,
                     dot: true,<% if (includeSass) { %>
-                    cwd: '.',
-                    src: ['bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/*.*'],<% } else { %>
-                    cwd: 'bower_components/bootstrap/dist',
-                    src: ['fonts/*.*'],<% } %>
-                    dest: '<%%= config.dist %>'
+                    cwd: 'bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/',
+                    src: ['*.*'],<% } else { %>
+                    cwd: 'bower_components/bootstrap/dist/fonts/',
+                    src: ['*.*'],<% } %>
+                    dest: '<%%= config.dist %>/styles/fonts'
                 }<% } %>]
             },
             styles: {

diff --git a/app/templates/main.scss b/app/templates/main.scss
@@ -1,4 +1,4 @@
-<% if (includeBootstrap) { %>$icon-font-path: "../../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
+<% if (includeBootstrap) { %>$icon-font-path: "../styles/fonts/";
 
 // bower:scss
 @import '../../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss';