diff options
| author | Mark Otto <[email protected]> | 2013-08-18 10:35:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 10:35:26 -0700 |
| commit | d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee (patch) | |
| tree | 19e1986b74067d660021f24c0c4e7c32effc06f6 /Gruntfile.js | |
| parent | 92d89895530818e4011156c16eac2112f8bbaf89 (diff) | |
| parent | f8b65b41ab0c1bc130c3ca521fb99214f5509568 (diff) | |
| download | bootstrap-d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee.tar.xz bootstrap-d7eee9bd6ecbe4724ef0f9644edb92a9ede91bee.zip | |
Merge pull request #9767 from twbs/bs3_restore_glyphicons
BS3: Restore Glyphicons
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 3007bb1e1..dd6fb5f0e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -97,6 +97,14 @@ module.exports = function(grunt) { } }, + copy: { + fonts: { + expand: true, + src: ["fonts/*"], + dest: 'dist/' + } + }, + qunit: { options: { inject: 'js/tests/unit/phantom.js' @@ -147,6 +155,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-uglify'); @@ -176,8 +185,11 @@ module.exports = function(grunt) { // CSS distribution task. grunt.registerTask('dist-css', ['recess']); + // Fonts distribution task. + grunt.registerTask('dist-fonts', ['copy']); + // Full distribution task. - grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']); + grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']); // Default task. grunt.registerTask('default', ['test', 'dist', 'build-customizer']); |