Merge remote-tracking branch 'upstream/master'

syncing for the first time
This commit is contained in:
Jean Pierre Huart 2015-06-26 18:08:02 +02:00
commit 1f11924be3

View File

@ -205,6 +205,24 @@ The main bundle require two scripts to be executed :
Those will populate database, respectively, with countries (using ISO declaration) and languages (using, also, ISO informations). Those will populate database, respectively, with countries (using ISO declaration) and languages (using, also, ISO informations).
Building CSS (optionnal)
^^^^^^^^^^^^^^^^^^^^^^^^
For this step, npm must be installed.
A build version of the needed CSS file is provided within the main bundle `Resources/public/css/chillmain.css`. For rebuilding it :
.. code-block:: bash
#in the main bundle directory ( vendor/chill-project/main/ )
cd Resources/
npm install
grunt
Launch your server Launch your server
^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^