Merge pull request #120 from LeoColomb/master

Fixes some bugs and improve Grunt tasks

Gruntfile.js

@@ -1,4 +1,6 @@
-module.exports = function(grunt) {
+module.exports = function (grunt) {
+    'use strict';
+
     grunt.loadNpmTasks('grunt-php');
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-watch');
@@ -7,33 +9,37 @@ module.exports = function(grunt) {
         php: {
             dist: {
                 options: {
-                	keepalive: true,
+                    keepalive: true,
-                	open: true,
+                    open: true,
                     port: 8085
                 }
             }
         },
         less: {
-          development: {
+            development: {
-            files: {
+                options: {
-              "css/daux-blue.css": "less/daux-blue.less",
+                    cleancss: true,
-              "css/daux-green.css": "less/daux-green.less",
+                    report: 'min'
-              "css/daux-navy.css": "less/daux-navy.less",
+                },
-              "css/daux-red.css": "less/daux-red.less"
+                files: {
+                    "css/daux-blue.min.css": "less/daux-blue.less",
+                    "css/daux-green.min.css": "less/daux-green.less",
+                    "css/daux-navy.min.css": "less/daux-navy.less",
+                    "css/daux-red.min.css": "less/daux-red.less"
+                }
             }
-          }
         },
         watch: {
-          scripts: {
+            scripts: {
-            files: ['less/**/*.less'],
+                files: ['less/**/*.less'],
-            tasks: ['less'],
+                tasks: ['less'],
-            options: {
+                options: {
-              nospawn: true
+                    nospawn: true
+                },
             },
-          },
         },
     });
 
     //grunt.registerTask('default', ['less', 'watch']);
     grunt.registerTask('default', ['php']);
-}
+};

less/import/components.less

@@ -64,14 +64,6 @@ code {
                 color: @light;
             }
         }
-
-        @media (max-width: 767px) {
-            padding: 6px 10px; .navbar-text {
-                line-height: 16px;
-                margin: 12px 6px;
-                font-size: 12px;
-            }
-        }
     }
 
     @media (min-width: 768px) and (max-width: 979px) {

less/import/structure.less

@@ -211,8 +211,11 @@ html, body {
 
 .content-area, .article-tree {
     overflow: auto;
-    height: 100%;
     padding: 0px;
+
+    @media (min-width: 767px) {
+        height: 100%;
+    }
 }
 
 //mobile friendly sub-nav

package.json

@@ -1,13 +1,13 @@
 {
   "name": "daux.io",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": true,
   "dependencies": {
     "grunt": "~0.4.1",
-    "grunt-php": "~0.1.1",
+    "grunt-php": "~0.3.0",
-    "grunt-contrib-less": "~0.5.2"
+    "grunt-contrib-less": "~0.9.0"
   },
   "devDependencies": {
-    "grunt-contrib-watch": "~0.4.4"
+    "grunt-contrib-watch": "~0.5.0"
   }
 }