aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rwxr-xr-xGNUmakefile7
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig1
3 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 553b0e94..797e0496 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,6 @@ app/Resources/build/
55admin-export.json 55admin-export.json
56specialexport.json 56specialexport.json
57/data/site-credentials-secret-key.txt 57/data/site-credentials-secret-key.txt
58
59# Custom CSS file
60web/custom.css
diff --git a/GNUmakefile b/GNUmakefile
index 15d737db..865b35e8 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,14 +10,14 @@ help: ## Display this help menu
10clean: ## Clear the application cache 10clean: ## Clear the application cache
11 rm -rf var/cache/* 11 rm -rf var/cache/*
12 12
13install: ## Install wallabag with the latest version 13install: customcss ## Install wallabag with the latest version
14 @./scripts/install.sh $(ENV) 14 @./scripts/install.sh $(ENV)
15 15
16update: ## Update the wallabag installation to the latest version 16update: ## Update the wallabag installation to the latest version
17 @./scripts/update.sh $(ENV) 17 @./scripts/update.sh $(ENV)
18 18
19dev: ENV=dev 19dev: ENV=dev
20dev: build ## Install the latest dev version 20dev: build customcss ## Install the latest dev version
21 @./scripts/dev.sh 21 @./scripts/dev.sh
22 22
23run: ## Run the wallabag built-in server 23run: ## Run the wallabag built-in server
@@ -27,6 +27,9 @@ build: ## Run webpack
27 @npm install 27 @npm install
28 @npm run build:$(ENV) 28 @npm run build:$(ENV)
29 29
30customcss:
31 @touch web/custom.css
32
30prepare: clean ## Prepare database for testsuite 33prepare: clean ## Prepare database for testsuite
31ifdef DB 34ifdef DB
32 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml 35 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index c0eecd57..befe2ef2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -43,6 +43,7 @@
43 43
44 {% block css %} 44 {% block css %}
45 {% endblock %} 45 {% endblock %}
46 <link rel="stylesheet" href="{{ asset('custom.css') }}">
46 {% block scripts %} 47 {% block scripts %}
47 <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script> 48 <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
48 <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script> 49 <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>