Fix #377

hawtio · Jun 26, 2013 · 8e4aa48 · 8e4aa48
1 parent 66a5366
commit 8e4aa48
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/hawtio-web/GruntFile.js b/hawtio-web/GruntFile.js
@@ -5,6 +5,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-type');
   grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-less');
 
   /*
    grunt.loadNpmTasks('grunt-typescript');
@@ -46,6 +47,19 @@ module.exports = function (grunt) {
         }
       }
     },
+    less: {
+      options: {
+        paths: ['src/main/webapp/css']
+      },
+      src: {
+        expand: true,
+        cwd: 'src/main/webapp/css',
+        src: '*.less',
+        ext: '.css',
+        dest: "<%= grunt.option('webapp_outdir') %>/css"
+      }
+
+    },
     copy:{
       dist: {
         files: [
@@ -86,9 +100,9 @@ module.exports = function (grunt) {
 
 
   // Default task.
-  grunt.registerTask('default', ['clean-appjs', 'type', 'concat', 'copy']);
+  grunt.registerTask('default', ['clean-appjs', 'type', 'concat', 'copy', 'less']);
 
   // watch source for changes
-  grunt.registerTask('watchSrc', ['clean-appjs', 'type', 'concat', 'copy', 'watch']);
+  grunt.registerTask('watchSrc', ['clean-appjs', 'type', 'concat', 'copy', 'less', 'watch']);
 
 };
diff --git a/hawtio-web/package.json b/hawtio-web/package.json
@@ -35,6 +35,7 @@
         "grunt-contrib-concat": "~0.3.0",
         "grunt-contrib-watch": "~0.4.4",
         "grunt-contrib-nodeunit": "~0.2.0",
+        "grunt-contrib-less": "~0.6.1",
         "grunt-type": "~0.9.0"
     },
     "analyze": true,

diff --git a/hawtio-web/src/main/webapp/index.html b/hawtio-web/src/main/webapp/index.html
@@ -32,10 +32,9 @@
   <link rel='stylesheet' href='css/codemirror/themes/xq-dark.css' type='text/css'>
   <link rel='stylesheet' href='css/toastr.css' type='text/css'>
 
-  <link rel='stylesheet/less' href='css/site-base.less' type='text/css'>
-
-  <link rel='stylesheet/less' media='screen and (min-width: 980px)' href='css/site-wide.less' type='text/css'>
-  <link rel='stylesheet/less' media='screen and (max-width: 979px)' href='css/site-narrow.less' type='text/css'>
+  <link rel='stylesheet' href='css/site-base.css' type='text/css'>
+  <link rel='stylesheet' media='screen and (min-width: 980px)' href='css/site-wide.css' type='text/css'>
+  <link rel='stylesheet' media='screen and (max-width: 979px)' href='css/site-narrow.css' type='text/css'>
 
   <link rel='icon' type='image/ico' href='favicon.ico'>
 
@@ -209,16 +208,5 @@
 <!-- google maps -->
 <script src="http://maps.googleapis.com/maps/api/js?sensor=false" type="text/javascript"></script>
 
-<!-- less -->
-<!-- TODO - enable for development only -->
-<script type="text/javascript">
-  less = {
-    async: false,
-    poll: 1000,
-    dumpLineNumbers: 'comments'
-  };
-</script>
-<script src="lib/less-1.3.3.min.js" type="text/javascript"></script>
-
 </body>
 </html>