Self hosted FLOSS fitness/workout, nutrition and weight tracker
Simplify command to compile the SASS files
Roland Geiderfead6278aba8
diff --git a/docs/changelog.rst b/docs/changelog.rstindex c0fdf414e..ff229e172 100644--- a/docs/changelog.rst+++ b/docs/changelog.rst@@ -9,7 +9,7 @@ Upgrade steps from 1.9:* Update python libraries ``pip install -r requirements.txt``* Install ``yarn`` and ``sass`` (e.g. ``sudo npm install -g yarn sass``)* Update CSS and JS libraries ``yarn install``-* Compile the CSS ``sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css``+* Compile the CSS ``yarn build:css:sass``* Run migrations ``python manage.py migrate``* Update static files (only production): ``python manage.py collectstatic``* Subcommands for ``wger`` now use dashes in their names (i.e. create-settings instead of create_settings)diff --git a/docs/tips_and_tricks.rst b/docs/tips_and_tricks.rstindex 57de0bf83..d2dea5013 100644--- a/docs/tips_and_tricks.rst+++ b/docs/tips_and_tricks.rst@@ -32,7 +32,7 @@ Updating SASS files```````````````````After updating the SASS files, you need to compile them to regular CSS::- sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css+ yarn build:css:sassClearing the cachediff --git a/package.json b/package.jsonindex ab38ce1df..f9dafc912 100644--- a/package.json+++ b/package.json@@ -28,6 +28,9 @@"shariff": "^3.2.1","tinymce": "^5.4.2"},+ "scripts": {+ "build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css"+ },"engines": {"yarn": ">= 1.0.0"}diff --git a/wger/tasks.py b/wger/tasks.pyindex ca224b18c..bc73c2a20 100644--- a/wger/tasks.py+++ b/wger/tasks.py@@ -87,7 +87,7 @@ def bootstrap(context,# Download JS and CSS librariescontext.run("yarn install")- context.run("sass core/static/scss/main.scss:core/static/yarn/bootstrap-compiled.css")+ context.run("yarn build:css:sass")@task(help={'settings-path': 'Path to settings file (absolute path). Leave empty for '