Getting rid of grunt; using npm scripts instead

5 files changed, 15 insertions, 15 deletions

diff --git a/web-ui/app/index.html b/web-ui/app/index.html
index 546a59b6..16521d37 100644
--- a/web-ui/app/index.html
+++ b/web-ui/app/index.html
@@ -61,7 +61,7 @@
   </div>
 </div>
 
-<!-- build:js app.min.js -->
+<!--usemin_start-->
 <script src="/bower_components/modernizr/modernizr.js"></script>
 <script src="/bower_components/lodash/dist/lodash.js"></script>
 <script src="/bower_components/jquery/dist/jquery.js"></script>
@@ -71,9 +71,9 @@
 <script src="/bower_components/foundation/js/foundation.js" ></script>
 <script src="/bower_components/foundation/js/foundation/foundation.reveal.js" ></script>
 <script src="/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script>
-<!-- endbuild-->
+<script src="/bower_components/requirejs/require.js" data-main="js/main.js"></script>
+<!--usemin_end-->
 
-<!-- remove-in-build --><script src="/bower_components/requirejs/require.js" data-main="js/main.js"></script><!-- end-remove-in-build -->
 
 
 <script>
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index 4847eb4d..9d202207 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -49,7 +49,7 @@ define(['hbs/templates'], function (templates) {
       refreshTrigger: window.Pixelated['app/templates/mail_actions/refresh_trigger.hbs'],
       paginationTrigger: window.Pixelated['app/templates/mail_actions/pagination_trigger.hbs']
     },
-    noMessageSelected: window.Pixelated['app/templates/no_message_selected.hbs'],
+    noMessageSelected: window.Pixelated['app/templates/compose/no_message_selected.hbs'],
     search: {
       trigger: window.Pixelated['app/templates/search/search_trigger.hbs']
     },
diff --git a/web-ui/app/scss/main.scss b/web-ui/app/scss/main.scss
index 8489d525..f4ce2c4b 100644
--- a/web-ui/app/scss/main.scss
+++ b/web-ui/app/scss/main.scss
@@ -1,8 +1,8 @@
-@import "reset.scss";
-@import "foundation.scss";
 @import "compass/css3";
-@import "colors.scss";
-@import "styles.scss";
+@import "reset";
+@import "foundation";
+@import "colors";
+@import "styles";
 
 
 html {
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/styles.scss
index 7fe0ec05..bd7ea2b5 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/styles.scss
@@ -1,11 +1,11 @@
 @import "compass/css3";
-@import "colors.scss";
-@import "mixins.scss";
-@import "alerts.scss";
-@import "read.scss";
-@import "reply.scss";
-@import "compose.scss";
-@import "security.scss";
+@import "colors";
+@import "mixins";
+@import "alerts";
+@import "read";
+@import "reply";
+@import "compose";
+@import "security";
 
 
 #logo {
diff --git a/web-ui/app/templates/no_message_selected.hbs b/web-ui/app/templates/compose/no_message_selected.hbs
index 0442192d..0442192d 100644
--- a/web-ui/app/templates/no_message_selected.hbs
+++ b/web-ui/app/templates/compose/no_message_selected.hbs