Merge remote-tracking branch 'origin/develop' into develop

pydio · Mar 23, 2016 · 874a681 · 874a681
2 parents 60126de + aa4bf7a
commit 874a681
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 583 deletions.
diff --git a/core/src/plugins/access.ajxp_home/Gruntfile.js b/core/src/plugins/access.ajxp_home/Gruntfile.js
@@ -15,6 +15,18 @@ module.exports = function(grunt) {
                 ]
             }
         },
+        less: {
+            development: {
+                options: {
+                    compress: true,
+                    yuicompress: true,
+                    optimization: 2
+                },
+                files: {
+                    "res/home.css": "res/home.less"
+                }
+            }
+        },
         watch: {
             js: {
                 files: [
@@ -24,11 +36,19 @@ module.exports = function(grunt) {
                 options: {
                     spawn: false
                 }
+            },
+            styles: {
+                files: ['res/*.less'],
+                tasks: ['less'],
+                options: {
+                    nospawn: true
+                }
             }
         }
     });
     grunt.loadNpmTasks('grunt-babel');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.registerTask('default', ['babel']);
+    grunt.loadNpmTasks('assemble-less');
+    grunt.registerTask('default', ['babel', 'less', 'watch']);
 
-};
+};
diff --git a/core/src/plugins/access.ajxp_home/package.json b/core/src/plugins/access.ajxp_home/package.json
@@ -12,6 +12,7 @@
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-babel": "~5.0.3",
-    "grunt-contrib-watch": "~0.6.1"
+    "grunt-contrib-watch": "~0.6.1",
+    "assemble-less": "~0.7.0"
   }
 }