From 7a4c375ebfae5aa43c663b1084acfb68f61b30b8 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Wed, 9 Oct 2019 18:20:26 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Allow=20custom=20styles=20system=20?= =?UTF-8?q?wide?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should fix #4060 --- .gitignore | 3 +++ GNUmakefile | 7 +++++-- src/Wallabag/CoreBundle/Resources/views/base.html.twig | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 553b0e947..797e0496c 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 15d737db5..865b35e8b 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 c0eecd574..befe2ef27 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 %} + {% block scripts %}