Permalink
Browse files

Merge pull request #1368 from leider/master

deps bump
  • Loading branch information...
NicoleRauch committed Sep 3, 2018
2 parents b4defdd + 4cfd709 commit 4fb73e5e1cd434e859ec076be677fcf87a73da56
Showing with 354 additions and 198 deletions.
  1. +2 −1 .gitignore
  2. +5 −4 Gruntfile.js
  3. +325 −171 package-lock.json
  4. +22 −22 package.json
View
@@ -33,6 +33,7 @@ dev-goodies
**/public/fonts
**/public/images
**/public/stylesheets
**/public/webfonts
softwerkskammer/chado-result.json
softwerkskammer/public/img/bootstrap-colorpicker
@@ -42,4 +43,4 @@ local
test.html
docker/local-openid/
docker/mongo/
docker/mongo/
View
@@ -56,7 +56,8 @@ module.exports = function (grunt) {
'softwerkskammer/build/stylesheets/less/bootstrap.less',
'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css',
'softwerkskammer/build/stylesheets/less/bootstrap-markdown-patched.less',
'node_modules/font-awesome/css/font-awesome.css',
'node_modules/@fortawesome/fontawesome-free/css/all.css',
'node_modules/@fortawesome/fontawesome-free/css/v4-shims.css',
'node_modules/node-syntaxhighlighter/lib/styles/shCoreDefault.css',
'node_modules/drmonty-smartmenus/css/jquery.smartmenus.bootstrap.css',
'node_modules/datatables.net-bs/css/dataTables.bootstrap.css',
@@ -73,7 +74,7 @@ module.exports = function (grunt) {
clean: {
build: ['softwerkskammer/build', 'softwerkskammer/frontendtests/fixtures/*.html'],
coverage: ['softwerkskammer/coverage', 'softwerkskammer/coverageWithDB', 'softwerkskammer/karma-coverage'],
public: ['softwerkskammer/public/clientscripts', 'softwerkskammer/public/fonts', 'softwerkskammer/public/img/bootstrap-colorpicker', 'softwerkskammer/public/images', 'softwerkskammer/public/stylesheets'],
public: ['softwerkskammer/public/clientscripts', 'softwerkskammer/public/fonts', 'softwerkskammer/public/webfonts', 'softwerkskammer/public/img/bootstrap-colorpicker', 'softwerkskammer/public/images', 'softwerkskammer/public/stylesheets'],
options: {force: true}
},
copy: {
@@ -126,8 +127,8 @@ module.exports = function (grunt) {
flatten: true
},
fontawesomeFONTS: {
src: 'node_modules/font-awesome/fonts/*',
dest: 'softwerkskammer/public/fonts',
src: 'node_modules/@fortawesome/fontawesome-free/webfonts/*',
dest: 'softwerkskammer/public/webfonts',
expand: true,
flatten: true
},
Oops, something went wrong.

0 comments on commit 4fb73e5

Please sign in to comment.