Skip to content

Commit

Permalink
feat(core): font icons
Browse files Browse the repository at this point in the history
added fontawesome icons support
  • Loading branch information
ygatesoupe committed Jan 28, 2016
1 parent acb4a04 commit f90a0b8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
17 changes: 15 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ module.exports = function (grunt) {
'.tmpdocs/assets/js/src/application-orange.js'
],
dest: '.tmpdocs/assets/js/src/application.js'
},
fontIcons: {
src: [
'dist/css/bootstrap.css',
'bower_components/fontawesome/css/font-awesome.css'
],
dest: 'dist/css/bootstrap.css'
}
/* end mod */
},
Expand Down Expand Up @@ -356,6 +363,12 @@ module.exports = function (grunt) {
src: ['*'],
dest: 'dist/fonts/'
},
fontIcons: {
expand: true,
cwd: 'bower_components/fontawesome/fonts/',
src: ['*'],
dest: 'dist/fonts/'
},
img: {
expand: true,
cwd: 'img/',
Expand Down Expand Up @@ -620,10 +633,10 @@ module.exports = function (grunt) {
// grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']);
grunt.registerTask('sass-compile', ['sass:core', 'copy:tmpdocs', 'sass:docs']);

grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']);
grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'csscomb:dist', 'concat:fontIcons', 'cssmin:core', 'cssmin:docs']);

// Full distribution task.
grunt.registerTask('dist', ['clean:dist', 'clean:tmp', 'dist-css', 'dist-js', 'copy:fonts', 'copy:img']);
grunt.registerTask('dist', ['clean:dist', 'clean:tmp', 'dist-css', 'dist-js', 'copy:fonts', 'copy:fontIcons','copy:img']);

// Default task.
grunt.registerTask('default', ['clean:dist', 'test']);
Expand Down
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
"test-infra"
],
"dependencies": {
"jquery": "1.9.1 - 2",
"jquery": "1.9.1 - 2",
"tether": "^1.1.1"
},
"devDependencies": {
"jquery.tablesorter": "~2.25.0"
"jquery.tablesorter": "~2.25.0",
"fontawesome": "~4.5.0"
}
}

0 comments on commit f90a0b8

Please sign in to comment.