From: Jérémy Fabre <blackmagik88@gmail.com>
Date: Thu, 21 Jul 2016 12:49:59 +0000 (+0200)
Subject: Merge branch 'wip' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=99b4d9e62fd78596b0a6300fdd99e1a5525f05d7;p=mezzo.git

Merge branch 'wip' into dev
---

99b4d9e62fd78596b0a6300fdd99e1a5525f05d7
diff --cc README.rst
index 9415419e,25c6888d..2cc072ae
--- a/README.rst
+++ b/README.rst
@@@ -59,7 -59,7 +59,7 @@@ If the app is broken after a restore sc
      docker-compose restart
  
  
- Work with gulp
 -Installing gulp dependencies
++Installing dependencies
  ==================
  
  Gulp allow to compile scss to css, concatenate js files and has a watcher, who do this tasks on file change.
@@@ -67,17 -67,30 +67,32 @@@ Gulp require nodejs installed on your c
  
  1. Install gulp globally:
  
-     sudo npm install --global gulp
 -  If you have previously installed a version of gulp globally, please run `npm rm --global gulp`
 -  to make sure your old version doesn't collide with gulp-cli::
++    sudo npm install --g gulp
  
 -    npm install --global gulp
 +2. Install bower globally:
  
 -2. Install gulp dependencies::
 +    sudo npm install -g bower
 +
- 3. Install gulp dependancies::
++3. Install gulp dependencies::
  
      npm install
  
- 4. Install bower components::
 -3. Install ruby dependencies::
++4. Install ruby dependencies::
+ 
+     gem install bundler
+     bundle install
+ 
++
+ Compile static files
+ ==================
+ 
+ Static files are not included in Git. You need to compile them locally.
+ 
+ 1. Installing gulp dependencies::
+ 
+   See previous section.
+ 
+ 2. Fetching Bower components::
  
      bower install