diff -r eadaf0b8f02e -r a9b98b16b053 server/bo_client/ember-cli-build.js --- a/server/bo_client/ember-cli-build.js Fri Nov 27 17:59:36 2015 +0100 +++ b/server/bo_client/ember-cli-build.js Tue Dec 01 13:33:08 2015 +0100 @@ -1,20 +1,44 @@ /* global require, module */ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); +var pickFiles = require('broccoli-static-compiler'); module.exports = function(defaults) { var app = new EmberApp(defaults, { + outputPaths: { + vendor: { + js: '/assets/bo-client-vendor.js', + css: '/assets/bo-client-vendor.css' + } + }, + fingerprint: { + enabled: false + }, + storeConfigInMeta: false, // Add options here + emberCliFontAwesome: { + useScss: true + }, sassOptions: { includePaths: [ 'app/styles', - '../src/resources/assets/sass', - '../src/vendor/bower_components/bootstrap-sass/assets/stylesheets' ], } }); + // bootstrap + app.import('bower_components/bootstrap-sass/assets/javascripts/bootstrap.js'); + var bootstrapFonts = pickFiles('bower_components/bootstrap-sass/assets/fonts', { + srcDir: '/', + destDir: '/fonts' + }); + + + // app.import('../src/vendor/bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff', { + // destDir: 'fonts' + // }) + // Use `app.import` to add additional libraries to the generated // output files. // @@ -28,5 +52,5 @@ // please specify an object with the list of modules as keys // along with the exports of each module as its value. - return app.toTree(); + return app.toTree(bootstrapFonts); };