diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-04 10:10:36 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-04 10:10:40 +0200 |
commit | ca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a (patch) | |
tree | 00d3f3782937c8ffe7cc4ffec37adec5029b665f /Gruntfile.js | |
parent | 9f3a1cd20c13ad3384d079641c7bd079b4c1d6ae (diff) | |
download | wallabag-ca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a.tar.gz wallabag-ca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a.tar.zst wallabag-ca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a.zip |
Fix font & Travis
Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index bd0d6dda..a19f2940 100644 --- a/Gruntfile.js +++ b/Gruntfile.js | |||
@@ -123,27 +123,22 @@ module.exports = function (grunt) { | |||
123 | src: 'annotator.min.js', | 123 | src: 'annotator.min.js', |
124 | dest: '<%= buildDir %>/themes/_global/js/', | 124 | dest: '<%= buildDir %>/themes/_global/js/', |
125 | }, | 125 | }, |
126 | }, | ||
127 | symlink: { | ||
128 | baggyfonts: { | 126 | baggyfonts: { |
129 | files: [ | 127 | files: [ |
130 | { | 128 | { |
131 | expand: true, | 129 | expand: true, |
132 | overwrite: true, | ||
133 | cwd: '<%= modulesDir %>/icomoon-free-npm/Font', | 130 | cwd: '<%= modulesDir %>/icomoon-free-npm/Font', |
134 | src: 'IcoMoon-Free.ttf', | 131 | src: 'IcoMoon-Free.ttf', |
135 | dest: '<%= releaseDir %>/themes/baggy/fonts/', | 132 | dest: '<%= releaseDir %>/themes/baggy/fonts/', |
136 | }, | 133 | }, |
137 | { | 134 | { |
138 | expand: true, | 135 | expand: true, |
139 | overwrite: true, | ||
140 | cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts', | 136 | cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts', |
141 | src: 'ptsansbold.woff', | 137 | src: 'ptsansbold.woff', |
142 | dest: '<%= releaseDir %>/themes/baggy/fonts/', | 138 | dest: '<%= releaseDir %>/themes/baggy/fonts/', |
143 | }, | 139 | }, |
144 | { | 140 | { |
145 | expand: true, | 141 | expand: true, |
146 | overwrite: true, | ||
147 | cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/', | 142 | cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/', |
148 | src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'], | 143 | src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'], |
149 | dest: '<%= releaseDir %>/themes/baggy/fonts/', | 144 | dest: '<%= releaseDir %>/themes/baggy/fonts/', |
@@ -175,6 +170,8 @@ module.exports = function (grunt) { | |||
175 | }, | 170 | }, |
176 | ], | 171 | ], |
177 | }, | 172 | }, |
173 | }, | ||
174 | symlink: { | ||
178 | pics: { | 175 | pics: { |
179 | files: [ | 176 | files: [ |
180 | { | 177 | { |
@@ -206,7 +203,7 @@ module.exports = function (grunt) { | |||
206 | grunt.registerTask( | 203 | grunt.registerTask( |
207 | 'fonts', | 204 | 'fonts', |
208 | 'Install fonts', | 205 | 'Install fonts', |
209 | ['symlink:baggyfonts', 'symlink:materialfonts'] | 206 | ['copy:baggyfonts', 'copy:materialfonts'] |
210 | ); | 207 | ); |
211 | 208 | ||
212 | grunt.registerTask( | 209 | grunt.registerTask( |
@@ -218,7 +215,7 @@ module.exports = function (grunt) { | |||
218 | grunt.registerTask( | 215 | grunt.registerTask( |
219 | 'default', | 216 | 'default', |
220 | 'Build and install everything', | 217 | 'Build and install everything', |
221 | ['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'symlink'] | 218 | ['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'copy', 'symlink'] |
222 | ); | 219 | ); |
223 | 220 | ||
224 | grunt.registerTask( | 221 | grunt.registerTask( |