✨ Allow custom styles system wide

Should fix #4060

diff --git a/.gitignore b/.gitignore
index 553b0e947ff22e211c72e97164f14d6efc7fbc0c..797e0496cce0cc463d2e4c6354faf152c829233e 100644 (file)
--- 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 15d737db5099c13e0095179177d8efaf7271e849..865b35e8bd88f8342b510a2026cc2fe924f4e6f6 100755 (executable)
--- 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 c0eecd57499d0e6364cd47f951e3e9a8979f63af..befe2ef277921772c1adeece6a819ee08b701364 100644 (file)
--- 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>