diff options
author | Luc Didry <luc@didry.org> | 2019-10-09 18:20:26 +0200 |
---|---|---|
committer | Luc Didry <luc@didry.org> | 2019-10-11 10:40:25 +0200 |
commit | 7a4c375ebfae5aa43c663b1084acfb68f61b30b8 (patch) | |
tree | 82565b6007334585cd5c79c9bfc06d1f6d471b8e | |
parent | afe486531d4dfffff7522efecdff1bcf18d13994 (diff) | |
download | wallabag-7a4c375ebfae5aa43c663b1084acfb68f61b30b8.tar.gz wallabag-7a4c375ebfae5aa43c663b1084acfb68f61b30b8.tar.zst wallabag-7a4c375ebfae5aa43c663b1084acfb68f61b30b8.zip |
✨ Allow custom styles system wide
Should fix #4060
-rw-r--r-- | .gitignore | 3 | ||||
-rwxr-xr-x | GNUmakefile | 7 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -55,3 +55,6 @@ app/Resources/build/ | |||
55 | admin-export.json | 55 | admin-export.json |
56 | specialexport.json | 56 | specialexport.json |
57 | /data/site-credentials-secret-key.txt | 57 | /data/site-credentials-secret-key.txt |
58 | |||
59 | # Custom CSS file | ||
60 | web/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 | |||
10 | clean: ## Clear the application cache | 10 | clean: ## Clear the application cache |
11 | rm -rf var/cache/* | 11 | rm -rf var/cache/* |
12 | 12 | ||
13 | install: ## Install wallabag with the latest version | 13 | install: customcss ## Install wallabag with the latest version |
14 | @./scripts/install.sh $(ENV) | 14 | @./scripts/install.sh $(ENV) |
15 | 15 | ||
16 | update: ## Update the wallabag installation to the latest version | 16 | update: ## Update the wallabag installation to the latest version |
17 | @./scripts/update.sh $(ENV) | 17 | @./scripts/update.sh $(ENV) |
18 | 18 | ||
19 | dev: ENV=dev | 19 | dev: ENV=dev |
20 | dev: build ## Install the latest dev version | 20 | dev: build customcss ## Install the latest dev version |
21 | @./scripts/dev.sh | 21 | @./scripts/dev.sh |
22 | 22 | ||
23 | run: ## Run the wallabag built-in server | 23 | run: ## 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 | ||
30 | customcss: | ||
31 | @touch web/custom.css | ||
32 | |||
30 | prepare: clean ## Prepare database for testsuite | 33 | prepare: clean ## Prepare database for testsuite |
31 | ifdef DB | 34 | ifdef 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> |