updated Gruntfile & LESS build file for new structure

mailpile · Nov 25, 2014 · 1c7850a · 1c7850a
1 parent a93bf3d
commit 1c7850a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,8 +9,8 @@ module.exports = function(grunt) {
           separator: ';'
         },
         src: [
-          'static/default/js/libraries.js',
-          'static/default/js/helpers.js',
+          'mailpile/www/default/js/libraries.js',
+          'mailpile/www/default/js/helpers.js',
           'bower_components/underscore/underscore.js',
           'bower_components/backbone/backbone.js',
           'bower_components/backbone-validation/dist/backbone-validation.js',
@@ -28,13 +28,13 @@ module.exports = function(grunt) {
           'bower_components/bootstrap/js/dropdown.js',
           'bower_components/bootstrap/js/modal.js',
           'bower_components/mousetrap/mousetrap.js',
-          'static/default/js/mousetrap.global.bind.js',
+          'mailpile/www/default/js/mousetrap.global.bind.js',
           'bower_components/listjs/dist/list.js',
           'bower_components/purl/purl.js',
           'bower_components/favico.js/favico.js',
           'bower_components/select2/select2.js'
         ],
-        dest: 'static/default/js/libraries.min.js'
+        dest: 'mailpile/www/default/js/libraries.min.js'
       },
     },
     uglify: {
@@ -43,7 +43,7 @@ module.exports = function(grunt) {
       },
       js: {
         files: {
-          'static/default/js/libraries.min.js': ['static/default/js/libraries.min.js']
+          'mailpile/www/default/js/libraries.min.js': ['mailpile/www/default/js/libraries.min.js']
         }
       }
     },
@@ -53,24 +53,24 @@ module.exports = function(grunt) {
       },
       style: {
         files: {
-          "static/default/css/default.css": "static/default/less/default.less"
+          "mailpile/www/default/css/default.css": "mailpile/www/default/less/default.less"
         }
       }
     },
     watch: {
       js: {
-        files: ['static/default/js/*.js'],
+        files: ['mailpile/www/default/js/*.js'],
         tasks: ['concat:js', 'uglify:js'],
         options: {
           livereload: true,
         }
       },
       css: {
         files: [
-          'static/default/less/config.less',
-          'static/default/less/default.less',
-          'static/default/less/app/*.less',
-          'static/default/less/libraries/*.less'
+          'mailpile/www/default/less/config.less',
+          'mailpile/www/default/less/default.less',
+          'mailpile/www/default/less/app/*.less',
+          'mailpile/www/default/less/libraries/*.less'
         ],
         tasks: ['less:style'],
         options: {

diff --git a/mailpile/www/default/less/default.less b/mailpile/www/default/less/default.less
@@ -12,22 +12,22 @@
 
 /* Bower */
 @import (less) "libraries/animate.css";
-@import "../../../bower_components/less-elements/elements.less";
+@import "../../../../bower_components/less-elements/elements.less";
 
 /* Rebar - these files reset and style all the basic HTML elements */
-@import "../../../bower_components/rebar/less/rebar/base.less";
-@import "../../../bower_components/rebar/less/rebar/buttons.less";
-@import "../../../bower_components/rebar/less/rebar/clearing.less";
-@import "../../../bower_components/rebar/less/rebar/forms.less";
-@import "../../../bower_components/rebar/less/rebar/images.less";
-@import "../../../bower_components/rebar/less/rebar/links.less";
-@import "../../../bower_components/rebar/less/rebar/lists.less";
-@import "../../../bower_components/rebar/less/rebar/rectangles.less";
-@import "../../../bower_components/rebar/less/rebar/separators.less";
+@import "../../../../bower_components/rebar/less/rebar/base.less";
+@import "../../../../bower_components/rebar/less/rebar/buttons.less";
+@import "../../../../bower_components/rebar/less/rebar/clearing.less";
+@import "../../../../bower_components/rebar/less/rebar/forms.less";
+@import "../../../../bower_components/rebar/less/rebar/images.less";
+@import "../../../../bower_components/rebar/less/rebar/links.less";
+@import "../../../../bower_components/rebar/less/rebar/lists.less";
+@import "../../../../bower_components/rebar/less/rebar/rectangles.less";
+@import "../../../../bower_components/rebar/less/rebar/separators.less";
 //@import "../../../bower_components/rebar/less/rebar/shapes.less";
-@import "../../../bower_components/rebar/less/rebar/tables.less";
-@import "../../../bower_components/rebar/less/rebar/typography.less";
-@import "../../../bower_components/rebar/less/rebar/validation.less";
+@import "../../../../bower_components/rebar/less/rebar/tables.less";
+@import "../../../../bower_components/rebar/less/rebar/typography.less";
+@import "../../../../bower_components/rebar/less/rebar/validation.less";
 
 /* Libraries */
 @import "libraries/bootstrap.less";