# HG changeset patch
# User domruf <dominikruf@gmail.com>
# Date 2017-12-18 22:20:10
# Node ID 1969f7dfb6b08f3c39f9e97fba59c0b167ec3d74
# Parent  7f571544a0ea4df23c7536fa158768f0addd5a69

move package.json to root directory

In the future we'll probably use it to manage more then just less/css stuff.
So the less directory is the wrong place.
The most common place is the root directory, so lets put it there.
Also, this way the --prefix parameter for npm is no longer required.

diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -19,8 +19,7 @@ include           kallithea/bin/ldap_syn
 include           kallithea/lib/paster_commands/template.ini.mako
 recursive-include kallithea/i18n *
 recursive-include kallithea/public *
-prune             kallithea/public/less/node_modules
-recursive-include kallithea/public/less/node_modules/bootstrap *
+recursive-include node_modules/bootstrap *
 recursive-include kallithea/templates *
 recursive-include kallithea/tests/fixtures *
 recursive-include kallithea/tests/scripts *
diff --git a/docs/contributing.rst b/docs/contributing.rst
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -37,8 +37,8 @@ To get started with Kallithea developmen
         pip install --upgrade pip setuptools
         pip install --upgrade -e .
         pip install --upgrade -r dev_requirements.txt
-        npm --prefix kallithea/public/less install     # install dependencies - both tools and data
-        npm --prefix kallithea/public/less run less    # for generating css from less
+        npm install     # install dependencies - both tools and data
+        npm run less    # for generating css from less
         gearbox make-config my.ini
         gearbox setup-db -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp
         gearbox serve -c my.ini --reload &
diff --git a/docs/setup.rst b/docs/setup.rst
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -17,8 +17,8 @@ Find the right ``kallithea/public/less``
 
 Then run::
 
-    npm --prefix kallithea/public/less install
-    npm --prefix kallithea/public/less run less
+    npm install
+    npm run less
 
 
 Setting up Kallithea
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -96,8 +96,8 @@ Find the right ``kallithea/public/less``
 
 Then run::
 
-    npm --prefix kallithea/public/less install
-    npm --prefix kallithea/public/less run less
+    npm install
+    npm run less
 
 
 5. Upgrade your configuration
diff --git a/kallithea/public/less/main.less b/kallithea/public/less/main.less
--- a/kallithea/public/less/main.less
+++ b/kallithea/public/less/main.less
@@ -3,8 +3,8 @@
  *
  * Instead, edit the less file(s) and regenerate the css:
  *
- * npm --prefix kallithea/public/less install
- * npm --prefix kallithea/public/less run less
+ * npm install
+ * npm run less
  *
  */
 
diff --git a/kallithea/public/less/package.json b/package.json
rename from kallithea/public/less/package.json
rename to package.json
--- a/kallithea/public/less/package.json
+++ b/package.json
@@ -9,6 +9,6 @@
     "less-plugin-clean-css": "~1.5"
   },
   "scripts": {
-    "less": "lessc --relative-urls main.less ../css/style.css"
+    "less": "lessc --relative-urls kallithea/public/less/main.less kallithea/public/css/style.css"
   }
 }