Merge 489ba6a into d9df691

.gitignore

@@ -73,17 +73,15 @@ vagrant_provision/
 .sass-cache
 
 # dojo/js stuff
-atramhasis/static/bower_components
-atramhasis/static/admin/src/*
-!atramhasis/static/admin/src/dojoConfig.js
-!atramhasis/static/admin/src/app
+atramhasis/static/node_modules
 atramhasis/static/admin/dist
-
 atramhasis/static/admin/node_modules
 
 atramhasis/scaffolds/atramhasis_demo/+package+/static/css
 atramhasis/scaffolds/atramhasis_demo/+package+/static/img
 atramhasis/scaffolds/atramhasis_demo/+package+/static/js
+atramhasis/scaffolds/atramhasis_demo/+package+/static/package.json
+atramhasis/scaffolds/atramhasis_demo/+package+/static/package-lock.json
 atramhasis/scaffolds/atramhasis_demo/+package+/static/scss/atramhasis
 atramhasis/scaffolds/atramhasis_demo/+package+/static/admin
 atramhasis/scaffolds/atramhasis_demo/atramhasis-requirements-dev.txt_tmpl
@@ -92,6 +90,8 @@ atramhasis/scaffolds/atramhasis_demo/atramhasis-requirements.txt_tmpl
 atramhasis/scaffolds/atramhasis_scaffold/+package+/static/css
 atramhasis/scaffolds/atramhasis_scaffold/+package+/static/img
 atramhasis/scaffolds/atramhasis_scaffold/+package+/static/js
+atramhasis/scaffolds/atramhasis_scaffold/+package+/static/package.json
+atramhasis/scaffolds/atramhasis_scaffold/+package+/static/package-lock.json
 atramhasis/scaffolds/atramhasis_scaffold/+package+/static/scss/atramhasis
 atramhasis/scaffolds/atramhasis_scaffold/+package+/static/admin
 atramhasis/scaffolds/atramhasis_scaffold/atramhasis-requirements-dev.txt_tmpl

atramhasis/scaffolds/atramhasis_demo/+package+/static/config.rb

@@ -1,7 +1,6 @@
 # Require any additional compass plugins here.                                  
-add_import_path "bower_components/foundation/scss" 
-add_import_path "bower_components/font-awesome/scss"
-add_import_path "bower_components/jqtree"
+add_import_path "node_modules/foundation-sites/scss"
+add_import_path "node_modules/font-awesome/scss"
 
 # Set this to the root of your project when deployed:
 http_path = "/"

atramhasis/scaffolds/atramhasis_scaffold/+package+/static/config.rb

@@ -1,7 +1,6 @@
 # Require any additional compass plugins here.                                  
-add_import_path "bower_components/foundation/scss" 
-add_import_path "bower_components/font-awesome/scss"
-add_import_path "bower_components/jqtree"
+add_import_path "node_modules/foundation-sites/scss"
+add_import_path "node_modules/font-awesome/scss"
 
 # Set this to the root of your project when deployed:
 http_path = "/"

atramhasis/static/admin/Gruntfile.js

@@ -1,17 +1,16 @@
 /*jshint node:true*/
 module.exports = function (grunt) {
-  require('load-grunt-tasks')(grunt, [ 'grunt-*' ]);
   var path = require('path');
 
   grunt.initConfig({
     dojo: {
       dist: {
         options: {
-          dojo: path.join('src', 'dojo', 'dojo.js'),
+          dojo: path.join('node_modules', 'dojo', 'dojo.js'),
           dojoConfig: path.join('src', 'dojoConfig.js'),
           profile: path.join('profiles', 'atramhasis.profile.js'),
           releaseDir: path.join('..', 'dist'),
-          basePath: path.join(__dirname, 'src')
+          basePath: path.join(__dirname, 'node_modules')
         }
       }
     },
@@ -40,6 +39,10 @@ module.exports = function (grunt) {
     }
   });
 
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-dojo');
+
   grunt.config('copy.fa', {
     files: [
       {