Skip to content

Commit

Permalink
Merge pull request #234 from NAL-i5K/add_missing_file
Browse files Browse the repository at this point in the history
add missing bootstrap files
  • Loading branch information
hsiaoyi0504 authored Sep 26, 2018
2 parents 66f6f9e + 8ae8d98 commit 404db5f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 228 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ dist/
/app/static/app/scripts/jquery.validate.js
/app/static/app/scripts/marked.min.js
/app/static/app/css/bootstrap.css
/app/static/app/css/bootstrap.css.map
/app/static/app/fonts/

/blast/static/blast/scripts/active-line.js
/blast/static/blast/scripts/codemirror.js
Expand Down
Binary file not shown.
228 changes: 0 additions & 228 deletions app/static/app/fonts/glyphicons-halflings-regular.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
7 changes: 7 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const nodeModules = path.resolve(__dirname, 'node_modules');

const appScripts = path.resolve(__dirname, 'app/static/app/scripts');
const appStyles = path.resolve(__dirname, 'app/static/app/css');
const appFonts = path.resolve(__dirname, 'app/static/app/fonts');
const appScriptConfig = {
entry: path.join(nodeModules, '/jquery/dist/jquery.js'), // Just a fake entry, we only copy files here
output: {
Expand All @@ -22,6 +23,12 @@ const appScriptConfig = {
{ from: path.join(nodeModules, '/underscore/underscore.js'), to: appScripts},
{ from: path.join(nodeModules, '/Respond.js/dest/respond.src.js'), to: appScripts},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css.map'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.eot'), to: appFonts},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.svg'), to: appFonts},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf'), to: appFonts},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.woff'), to: appFonts},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2'), to: appFonts},
])
],
module: {
Expand Down

0 comments on commit 404db5f

Please sign in to comment.