Merge pull request #596 from neilhem/fonts-dir

Update all fonts references
yeoman · Sep 26, 2015 · 13363a5 · 13363a5
2 parents 2384bab + a8b7c79
commit 13363a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -258,7 +258,7 @@ module.exports = function (grunt) {
           '<%%= config.dist %>/scripts/{,*/}*.js',
           '<%%= config.dist %>/styles/{,*/}*.css',
           '<%%= config.dist %>/images/{,*/}*.*',
-          '<%%= config.dist %>/styles/fonts/{,*/}*.*',
+          '<%%= config.dist %>/fonts/{,*/}*.*',
           '<%%= config.dist %>/*.{ico,png}'
         ]
       }
@@ -371,7 +371,7 @@ module.exports = function (grunt) {
             '*.{ico,png,txt}',
             'images/{,*/}*.webp',
             '{,*/}*.html',
-            'styles/fonts/{,*/}*.*'
+            'fonts/{,*/}*.*'
           ]
         }<% if (includeBootstrap) { %>, {
           expand: true,

diff --git a/docs/recipes/assemble.md b/docs/recipes/assemble.md
@@ -128,7 +128,7 @@ useminPrepare: {
             '*.{ico,png,txt}',
             'images/{,*/}*.webp',
 -           '{,*/}*.html',
-            'styles/fonts/{,*/}*.*'
+            'fonts/{,*/}*.*'
           ]
 +       }, {
 +         expand: true,

diff --git a/docs/recipes/compass.md b/docs/recipes/compass.md
@@ -55,12 +55,12 @@ compass: {
     cssDir: '.tmp/styles',
     imagesDir: '<%= config.app %>/images',
     javascriptsDir: '<%= config.app %>/scripts',
-    fontsDir: '<%= config.app %>/styles/fonts',
+    fontsDir: '<%= config.app %>/fonts',
     generatedImagesDir: '.tmp/images/generated',
     importPath: 'bower_components',
     httpImagesPath: '../images',
     httpGeneratedImagesPath: '../images/generated',
-    httpFontsPath: 'fonts',
+    httpFontsPath: '../fonts',
     relativeAssets: false,
     assetCacheBuster: false
   },