You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/07/03 17:34:45 UTC

[3/8] working with less and css

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2bf0c765/src/fauxton/assets/js/plugins/require-less/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-less/package.json b/src/fauxton/assets/js/plugins/require-less/package.json
new file mode 100644
index 0000000..aeed5c6
--- /dev/null
+++ b/src/fauxton/assets/js/plugins/require-less/package.json
@@ -0,0 +1,18 @@
+{
+  "volo": {
+    "type": "directory",
+    "dependencies": {
+      "require-css": "guybedford/require-css/0.0.6"
+    }
+  },
+  "jspm": {
+    "dependencies": {
+      "css": "0.0.6"
+    }
+  },
+  "jam": {
+    "dependencies": {
+      "require-css": "0.1.x"
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2bf0c765/src/fauxton/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index 88f33bc..fe34a79 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -11,13 +11,18 @@
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.6",
     "couchapp": "~0.9.1",
-    "grunt-contrib": "~0.5.0",
     "grunt-contrib-cssmin": "~0.5.0",
+    "grunt-contrib-clean": "~0.4.1",
+    "grunt-contrib-jshint": "~0.6.0",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-less": "~0.5.0",
+    "grunt-contrib-jst": "~0.5.0",
+    "grunt-contrib-watch": "~0.4.4",
     "grunt-contrib-uglify": "~0.2.0",
+    "grunt-contrib-copy": "~0.4.1",
     "grunt-couchapp": "~0.1.0",
     "grunt-exec": "~0.4.0",
     "grunt-init": "~0.2.0",
-    "grunt-jasmine-task": "~0.2.3",
     "grunt-requirejs": "~0.3.3",
     "underscore": "~1.4.2",
     "url": "~0.7.9",

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2bf0c765/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index 165fa44..1ed5c16 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -52,10 +52,11 @@ module.exports = function (grunt) {
       } else if (!!url.match(/\.css$|\/js\/|img/)) {
         // serve any javascript or css files from dist debug dir
         filePath = path.join(dist_dir,req.url);
+        console.log('css', url, filePath);
       } else if (!!url.match(/\.js$|\.html$/)) {
         // server js from app directory
-        console.log('js', req.url);
         filePath = path.join(app_dir,req.url.replace('/_utils/fauxton/app',''));
+        console.log('less', url, filePath);
       } else if (url === '/' && accept[0] !== 'application/json') {
         // serve main index file from here
         filePath = path.join(dist_dir, 'index.html');
@@ -73,7 +74,7 @@ module.exports = function (grunt) {
       return false;
     }
 
-    var watch = grunt.util.spawn({cmd: 'bbb', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ });
+    var watch = grunt.util.spawn({cmd: 'grunt', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ });
 
     watch.stdout.pipe(process.stdout);
     watch.stderr.pipe(process.stderr);