Merge branch '2375-demo-theme-development' of https://github.com/okfn…

…/ckan into 2375-demo-theme-development
ckan · Sep 5, 2012 · 0bf88cd · 0bf88cd
2 parents 4711f5f + 82940e3
commit 0bf88cd
Show file tree

Hide file tree

Showing 32 changed files with 1,982 additions and 860 deletions.
diff --git a/bin/less b/bin/less
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-var fs = require('fs'),
-    path = require('path'),
+var path = require('path'),
+    nodeWatch = require('nodewatch'),
     exec = require('child_process').exec,
     watch = path.join(__dirname, '..', 'ckan', 'public', 'base', 'less'),
     debug = process.env.ENV !== 'production',
@@ -39,5 +39,5 @@ if (lastArg === '-p' || lastArg === '--production') {
 }
 
 console.log('Watching %s', watch);
-fs.watch(watch, compile);
+nodeWatch.add(watch).onChange(compile);
 compile();
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
@@ -1253,8 +1253,8 @@ class CreateColorSchemeCommand(CkanCommand):
         '@layoutLinkColor',
         '@mastheadBackgroundColorStart',
         '@mastheadBackgroundColorEnd',
-        '@btnPrimaryBackgroundHighlight',
         '@btnPrimaryBackground',
+        '@btnPrimaryBackgroundHighlight',
     ]
 
     # list of predefined colors