Fixed broken custom css path

merge-requests/552/head
Eliot Berriot 2018-12-20 12:12:28 +01:00
rodzic 3b4543a0cb
commit 83f104ce01
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DD6965E2476E5C27
3 zmienionych plików z 6 dodań i 4 usunięć

Wyświetl plik

@ -182,7 +182,7 @@ work. We will store the necessary files in the ``/srv/funkwhale/custom`` directo
mkdir custom mkdir custom
cat <<EOF > custom/settings.json cat <<EOF > custom/settings.json
{ {
"additionalStylesheets": ["/custom/custom.css"] "additionalStylesheets": ["/front/custom/custom.css"]
} }
EOF EOF
cat <<EOF > custom/custom.css cat <<EOF > custom/custom.css
@ -194,7 +194,7 @@ work. We will store the necessary files in the ``/srv/funkwhale/custom`` directo
By executing the previous commands, you will end up with two files in your ``/srv/funkwhale/custom`` By executing the previous commands, you will end up with two files in your ``/srv/funkwhale/custom``
directory: directory:
- ``settings.json`` will tell the front-end what stylesheets you want to load (``/custom/custom.css`` in this example) - ``settings.json`` will tell the front-end what stylesheets you want to load (``/front/custom/custom.css`` in this example)
- ``custom.css`` will hold your custom CSS - ``custom.css`` will hold your custom CSS
The last step to make this work is to ensure both files are served by the reverse proxy. The last step to make this work is to ensure both files are served by the reverse proxy.

Wyświetl plik

@ -1,3 +1,5 @@
{ {
"additionalStylesheets": ["/custom.css"] "additionalStylesheets": [
"/front/custom.css"
]
} }

Wyświetl plik

@ -123,7 +123,7 @@ export default {
}) })
}, },
fetchFrontSettings ({commit}) { fetchFrontSettings ({commit}) {
return axios.get('/settings.json').then(response => { return axios.get('/front/settings.json').then(response => {
commit('frontSettings', response.data) commit('frontSettings', response.data)
}, response => { }, response => {
logger.default.error('Error when fetching front-end configuration (or no customization available)') logger.default.error('Error when fetching front-end configuration (or no customization available)')