Merge pull request #4151 from ldidry/fix-4060

 Allow custom styles system wide
This commit is contained in:
Jérémy Benoist 2019-11-19 14:25:41 +01:00 committed by GitHub
commit 48b0163d24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions

3
.gitignore vendored
View file

@ -55,3 +55,6 @@ app/Resources/build/
admin-export.json
specialexport.json
/data/site-credentials-secret-key.txt
# Custom CSS file
web/custom.css

View file

@ -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

View file

@ -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>