Grunt Support Added, Fixed Bower support on heroku

meanjs · Aug 26, 2013 · b1d0dba · b1d0dba
1 parent 3b4cfbb
commit b1d0dba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -20,21 +20,22 @@ module.exports = function(grunt) {
                 tasks: ['compass'],
                 options: {
                     livereload: true,
-                },
+                    force: true
+                }
             }
         },
         jshint: {
             all: ['gruntfile.js']
         },
-        compass: { // Task
-            dist: { // Target
-                options: { // Target options
+        compass: { //Task
+            dist: { //Target
+                options: { //Target options
                     sassDir: 'public/sass',
                     cssDir: 'public/css',
                     environment: 'production'
                 }
             },
-            dev: { // Another target
+            dev: { //Another target
                 options: {
                     sassDir: 'public/sass',
                     cssDir: 'public/css'
@@ -73,13 +74,16 @@ module.exports = function(grunt) {
         }
     });
 
-    // Load NPM tasks 
-    // grunt.loadNpmTasks('grunt-contrib-compass');
+    //Load NPM tasks 
+    grunt.loadNpmTasks('grunt-contrib-compass');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-nodemon');
     grunt.loadNpmTasks('grunt-concurrent');
 
-    // Default task(s).
-    grunt.registerTask('default', ['jshint', 'concurrent:target']);
-};
+    //Making grunt default to force inorder not to break the project.
+    grunt.option('force', true);
+
+    //Default task(s).
+    grunt.registerTask('default', ['jshint', 'compass', 'concurrent:target']);
+};
diff --git a/package.json b/package.json
@@ -28,13 +28,13 @@
         "underscore": "latest",
         "async": "latest",
         "view-helpers": "latest",
-        "mean-logger": "latest"
+        "mean-logger": "latest",
+        "bower": "latest"
     },
     "devDependencies": {
         "supertest": "latest",
         "should": "latest",
         "mocha": "latest",
-        "bower": "latest",
         "grunt": "~0.4.1",
         "grunt-contrib-compass": "~0.3.0",
         "grunt-contrib-watch": "~0.4.4",

diff --git a/public/sass/common.scss b/public/sass/common.scss
@@ -21,5 +21,4 @@ footer {
 }
 footer p{
      padding: 5px 0 12px 10px;
-}
-
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,5 +21,4 @@ footer { @@
     }
     footer p{
          padding: 5px 0 12px 10px;
-    }
+    }