From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Tue, 19 Nov 2019 13:25:41 +0000 (+0100)
Subject: Merge pull request #4151 from ldidry/fix-4060
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=48b0163d247554d7e2f1ec63b717c8216ea9ec59;hp=8668796106b856ca041512af27268ce6e49d2caf;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #4151 from ldidry/fix-4060

✨ Allow custom styles system wide
---

diff --git a/.gitignore b/.gitignore
index 553b0e94..797e0496 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,6 @@ app/Resources/build/
 admin-export.json
 specialexport.json
 /data/site-credentials-secret-key.txt
+
+# Custom CSS file
+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
 clean: ## Clear the application cache
 	rm -rf var/cache/*
 
-install: ## Install wallabag with the latest version
+install: customcss ## Install wallabag with the latest version
 	@./scripts/install.sh $(ENV)
 
 update: ## Update the wallabag installation to the latest version
 	@./scripts/update.sh $(ENV)
 
 dev: ENV=dev
-dev: build ## Install the latest dev version
+dev: build customcss ## Install the latest dev version
 	@./scripts/dev.sh
 
 run: ## Run the wallabag built-in server
@@ -27,6 +27,9 @@ build: ## Run webpack
 	@npm install
 	@npm run build:$(ENV)
 
+customcss:
+	@touch web/custom.css
+
 prepare: clean ## Prepare database for testsuite
 ifdef DB
 	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 @@
 
             {% block css %}
             {% endblock %}
+            <link rel="stylesheet" href="{{ asset('custom.css') }}">
             {% block scripts %}
             <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
             <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>