diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 00000000..47ad6673 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "public/lib" +} diff --git a/README.md b/README.md index d367cfa0..a4a624c1 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w Install dependencies: $ npm install + $ bower install We recommend using [Grunt](https://github.com/gruntjs/grunt-cli) to start the server: diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index fc890c4c..0ed95b26 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -1,7 +1,7 @@ script(type='text/javascript', src='/lib/jquery/jquery.js') //Bootstrap -script(type='text/javascript', src='/lib/bootstrap/js/bootstrap.js') +script(type='text/javascript', src='/lib/bootstrap-assets/js/bootstrap.js') //AngularJS script(type='text/javascript', src='/lib/angular/angular.js') @@ -10,7 +10,7 @@ script(type='text/javascript', src='/lib/angular-resource/angular-resource.js') //Angular UI script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js') -script(type='text/javascript', src='/lib/angular-ui-utils/modules/route.js') +script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js') //Application Init script(type='text/javascript', src='/js/app.js') diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade index 8bd0f416..07d1d486 100755 --- a/app/views/includes/head.jade +++ b/app/views/includes/head.jade @@ -19,8 +19,8 @@ head meta(property='og:site_name', content='MEAN - A Modern Stack') meta(property='fb:admins', content='APP_ADMIN') - link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap.css') - link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap-responsive.css') + link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap.css') + link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap-responsive.css') link(rel='stylesheet', href='/css/common.css') link(rel='stylesheet', href='/css/views/articles.css') diff --git a/bower.json b/bower.json index 10648432..e00fcd87 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "mean", "version": "1.0.0", "dependencies": { - "bootstrap": "2.3.2", + "bootstrap-assets": "2.3.2", "angular": "~1.0.6", "angular-resource": "~1.0.6", "angular-cookies": "~1.0.6", @@ -10,15 +10,5 @@ "angular-ui-utils": "0.0.4", "json3": "~3.2.4", "jquery": "~1.9.1" - }, - "exportsOverride": { - "bootstrap": { - "css": "docs/assets/css/bootstrap*.css", - "js": "docs/assets/js/bootstrap.js", - "img": "docs/assets/img/glyphicons-halflings*.png" - }, - "angular-ui-utils": { - "modules": "modules/route/route.js" - } } -} \ No newline at end of file +} diff --git a/gruntfile.js b/gruntfile.js index d76c6161..c4a8e2f6 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -60,17 +60,6 @@ module.exports = function(grunt) { reporter: 'spec' }, src: ['test/**/*.js'] - }, - bower: { - install: { - options: { - targetDir: './public/lib', - layout: 'byComponent', - install: true, - verbose: true, - cleanBowerDir: true - } - } } }); @@ -93,4 +82,4 @@ module.exports = function(grunt) { //Bower task. grunt.registerTask('install', ['bower']); -}; \ No newline at end of file +}; diff --git a/package.json b/package.json index 5c610909..72eddf49 100755 --- a/package.json +++ b/package.json @@ -35,8 +35,7 @@ "mean-logger": "latest", "forever": "latest", "grunt": "latest", - "grunt-cli": "latest", - "grunt-bower-task": "latest" + "grunt-cli": "latest" }, "devDependencies": { "supertest": "latest", @@ -47,4 +46,4 @@ "grunt-concurrent": "latest", "grunt-mocha-test": "latest" } -} \ No newline at end of file +}