Fix font & Travis
Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)
Jeremy Benoist
|
|
@ -86,6 +86,7 @@ before_script:
|
||||||
install:
|
install:
|
||||||
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
|
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
|
||||||
- if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
|
- if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
|
||||||
|
- if [[ $ASSETS = build ]]; then npm install; fi;
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
|
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
|
||||||
|
|
@ -96,4 +97,4 @@ script:
|
||||||
- if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
|
- if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
|
||||||
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
|
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
|
||||||
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
|
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
|
||||||
- if [[ $ASSETS = build ]]; then grunt; fi;
|
- if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi;
|
||||||
|
|
|
||||||
11
Gruntfile.js
|
|
@ -123,27 +123,22 @@ module.exports = function (grunt) {
|
||||||
src: 'annotator.min.js',
|
src: 'annotator.min.js',
|
||||||
dest: '<%= buildDir %>/themes/_global/js/',
|
dest: '<%= buildDir %>/themes/_global/js/',
|
||||||
},
|
},
|
||||||
},
|
|
||||||
symlink: {
|
|
||||||
baggyfonts: {
|
baggyfonts: {
|
||||||
files: [
|
files: [
|
||||||
{
|
{
|
||||||
expand: true,
|
expand: true,
|
||||||
overwrite: true,
|
|
||||||
cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
|
cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
|
||||||
src: 'IcoMoon-Free.ttf',
|
src: 'IcoMoon-Free.ttf',
|
||||||
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expand: true,
|
expand: true,
|
||||||
overwrite: true,
|
|
||||||
cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
|
cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
|
||||||
src: 'ptsansbold.woff',
|
src: 'ptsansbold.woff',
|
||||||
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expand: true,
|
expand: true,
|
||||||
overwrite: true,
|
|
||||||
cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
|
cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
|
||||||
src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
|
src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
|
||||||
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
dest: '<%= releaseDir %>/themes/baggy/fonts/',
|
||||||
|
|
@ -175,6 +170,8 @@ module.exports = function (grunt) {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
symlink: {
|
||||||
pics: {
|
pics: {
|
||||||
files: [
|
files: [
|
||||||
{
|
{
|
||||||
|
|
@ -206,7 +203,7 @@ module.exports = function (grunt) {
|
||||||
grunt.registerTask(
|
grunt.registerTask(
|
||||||
'fonts',
|
'fonts',
|
||||||
'Install fonts',
|
'Install fonts',
|
||||||
['symlink:baggyfonts', 'symlink:materialfonts']
|
['copy:baggyfonts', 'copy:materialfonts']
|
||||||
);
|
);
|
||||||
|
|
||||||
grunt.registerTask(
|
grunt.registerTask(
|
||||||
|
|
@ -218,7 +215,7 @@ module.exports = function (grunt) {
|
||||||
grunt.registerTask(
|
grunt.registerTask(
|
||||||
'default',
|
'default',
|
||||||
'Build and install everything',
|
'Build and install everything',
|
||||||
['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'symlink']
|
['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'copy', 'symlink']
|
||||||
);
|
);
|
||||||
|
|
||||||
grunt.registerTask(
|
grunt.registerTask(
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/icomoon-free-npm/Font/IcoMoon-Free.ttf
|
|
||||||
BIN
web/bundles/wallabagcore/themes/baggy/fonts/IcoMoon-Free.ttf
Normal file
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/material-design-icons-iconfont/dist/fonts/MaterialIcons-Regular.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/material-design-icons-iconfont/dist/fonts/MaterialIcons-Regular.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/material-design-icons-iconfont/dist/fonts/MaterialIcons-Regular.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/material-design-icons-iconfont/dist/fonts/MaterialIcons-Regular.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../node_modules/ptsans-npm-webfont/fonts/ptsansbold.woff
|
|
||||||
BIN
web/bundles/wallabagcore/themes/baggy/fonts/ptsansbold.woff
Normal file
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Black.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Black.svg
|
|
||||||
|
Before Width: | Height: | Size: 79 B After Width: | Height: | Size: 732 KiB |
10968
web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Black.svg
Normal file
|
Before Width: | Height: | Size: 79 B After Width: | Height: | Size: 732 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Black.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Black.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Black.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BlackItalic.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BlackItalic.svg
|
|
||||||
|
Before Width: | Height: | Size: 85 B After Width: | Height: | Size: 758 KiB |
|
Before Width: | Height: | Size: 85 B After Width: | Height: | Size: 758 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BlackItalic.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BlackItalic.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BlackItalic.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.svg
|
|
||||||
|
Before Width: | Height: | Size: 78 B After Width: | Height: | Size: 738 KiB |
11010
web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Bold.svg
Normal file
|
Before Width: | Height: | Size: 78 B After Width: | Height: | Size: 738 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Bold.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BoldItalic.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BoldItalic.svg
|
|
||||||
|
Before Width: | Height: | Size: 84 B After Width: | Height: | Size: 760 KiB |
|
Before Width: | Height: | Size: 84 B After Width: | Height: | Size: 760 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BoldItalic.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BoldItalic.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-BoldItalic.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Light.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Light.svg
|
|
||||||
|
Before Width: | Height: | Size: 79 B After Width: | Height: | Size: 726 KiB |
10564
web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Light.svg
Normal file
|
Before Width: | Height: | Size: 79 B After Width: | Height: | Size: 726 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Light.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Light.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Light.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-LightItalic.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-LightItalic.svg
|
|
||||||
|
Before Width: | Height: | Size: 85 B After Width: | Height: | Size: 750 KiB |
|
Before Width: | Height: | Size: 85 B After Width: | Height: | Size: 750 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-LightItalic.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-LightItalic.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-LightItalic.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Medium.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Medium.svg
|
|
||||||
|
Before Width: | Height: | Size: 80 B After Width: | Height: | Size: 736 KiB |
10999
web/bundles/wallabagcore/themes/material/font/roboto/Roboto-Medium.svg
Normal file
|
Before Width: | Height: | Size: 80 B After Width: | Height: | Size: 736 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Medium.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Medium.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Medium.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-MediumItalic.eot
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-MediumItalic.svg
|
|
||||||
|
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 761 KiB |
|
Before Width: | Height: | Size: 86 B After Width: | Height: | Size: 761 KiB |
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-MediumItalic.ttf
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-MediumItalic.woff
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-MediumItalic.woff2
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../../../../../../node_modules/roboto-fontface/fonts/Roboto/Roboto-Regular.eot
|
|
||||||