Skip to content

Commit

Permalink
fix(fonts): Ensuring that fonts are added to the ui-grid package. (#5844
Browse files Browse the repository at this point in the history
)

Ran the fontello task once to generate the font files, then added them to the build so that they can

be updated by anyone and to prevent chinese characters from displaying instead of the correct icons.

#5806
  • Loading branch information
mportuga authored and Southpaw17 committed Dec 6, 2016
1 parent d25c993 commit 8096ed0
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 2 deletions.
2 changes: 1 addition & 1 deletion grunt/aliases.js
Expand Up @@ -10,7 +10,7 @@ module.exports = function (grunt, options) {
'default': ['before-test', 'test:single', 'after-test'],

// Build with no testing
'build': ['ngtemplates', 'concat', 'uglify', 'less', 'ngdocs', 'copy:site', 'copy:less_customizer',],
'build': ['ngtemplates', 'concat', 'uglify', 'less', 'ngdocs', 'copy:font_dist', 'copy:site', 'copy:less_customizer',],

// Auto-test tasks for development
'autotest:unit': ['karmangular:start'],
Expand Down
56 changes: 56 additions & 0 deletions grunt/copy.js
Expand Up @@ -18,6 +18,62 @@ module.exports = function ( grunt ) {
}
]
},
font_dist: {
files: [
{
expand: true,
cwd: 'src/font',
src: '**/*.eot',
dest: '<%= dist %>/release/'
},
{
expand: true,
cwd: 'src/font',
src: '**/*.svg',
dest: '<%= dist %>/release/'
},
{
expand: true,
cwd: 'src/font',
src: '**/*.ttf',
dest: '<%= dist %>/release/'
},
{
expand: true,
cwd: 'src/font',
src: '**/*.woff',
dest: '<%= dist %>/release/'
}
]
},
font_cut_release: {
files: [
{
expand: true,
cwd: '<%= dist %>/release/',
src: '**/*.eot',
dest: '<%= dist %>/release/' + currentTag
},
{
expand: true,
cwd: '<%= dist %>/release/',
src: '**/*.svg',
dest: '<%= dist %>/release/' + currentTag
},
{
expand: true,
cwd: '<%= dist %>/release/',
src: '**/*.ttf',
dest: '<%= dist %>/release/' + currentTag
},
{
expand: true,
cwd: '<%= dist %>/release/',
src: '**/*.woff',
dest: '<%= dist %>/release/' + currentTag
}
]
},
less_customizer: {
files: [
{
Expand Down
1 change: 1 addition & 0 deletions grunt/cut-release.js
Expand Up @@ -3,6 +3,7 @@ module.exports = {
cleanup: true,
keepUnstable: false,
stableTasks: [
'copy:font_cut_release',
'copy:less_cut_release'
]
},
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion grunt/fontello.js
Expand Up @@ -4,7 +4,7 @@ module.exports = {
},
dist: {
options: {
config : 'src/font/config.json',
config : 'grunt/font-config.json',
fonts : 'dist/release',
styles : '.tmp/font',
scss : false
Expand Down
Binary file added src/font/ui-grid.eot
Binary file not shown.
56 changes: 56 additions & 0 deletions src/font/ui-grid.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/font/ui-grid.ttf
Binary file not shown.
Binary file added src/font/ui-grid.woff
Binary file not shown.

0 comments on commit 8096ed0

Please sign in to comment.