mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-09 16:35:27 +00:00
Code Issues Projects Releases Wiki Activity

✨ Allow custom styles system wide

Browse source 
Should fix #4060
This commit is contained in:
Luc Didry 2019-10-09 18:20:26 +02:00
parent afe486531d
commit 7a4c375ebf
No known key found for this signature in database
GPG key ID: EA868E12D0257E3C
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

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

7
GNUmakefile
View file

@ -10,14 +10,14 @@ help: ## Display this help menu
clean: ## Clear the application cache clean: ## Clear the application cache
rm -rf var/cache/* rm -rf var/cache/*
install: ## Install wallabag with the latest version install: customcss ## Install wallabag with the latest version
@./scripts/install.sh $(ENV) @./scripts/install.sh $(ENV)
update: ## Update the wallabag installation to the latest version update: ## Update the wallabag installation to the latest version
@./scripts/update.sh $(ENV) @./scripts/update.sh $(ENV)
dev: ENV=dev dev: ENV=dev
dev: build ## Install the latest dev version dev: build customcss ## Install the latest dev version
@./scripts/dev.sh @./scripts/dev.sh
run: ## Run the wallabag built-in server run: ## Run the wallabag built-in server
@ -27,6 +27,9 @@ build: ## Run webpack
@npm install @npm install
@npm run build:$(ENV) @npm run build:$(ENV)
customcss:
@touch web/custom.css
prepare: clean ## Prepare database for testsuite prepare: clean ## Prepare database for testsuite
ifdef DB ifdef DB
cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml

1
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View file

@ -43,6 +43,7 @@
{% block css %} {% block css %}
{% endblock %} {% endblock %}
<link rel="stylesheet" href="{{ asset('custom.css') }}">
{% block scripts %} {% block scripts %}
<script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script> <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
<script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script> <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>