From 83f104ce01ad8eebcaf7cce958680b7336b2cfcc Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 20 Dec 2018 12:12:28 +0100
Subject: [PATCH] Fixed broken custom css path
---
docs/configuration.rst | 4 ++--
front/public/settings.json | 4 +++-
front/src/store/instance.js | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 68744769..be382450 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -182,7 +182,7 @@ work. We will store the necessary files in the ``/srv/funkwhale/custom`` directo
mkdir custom
cat <<EOF > custom/settings.json
{
- "additionalStylesheets": ["/custom/custom.css"]
+ "additionalStylesheets": ["/front/custom/custom.css"]
}
EOF
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``
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
The last step to make this work is to ensure both files are served by the reverse proxy.
diff --git a/front/public/settings.json b/front/public/settings.json
index 133fb567..c25eb99f 100644
--- a/front/public/settings.json
+++ b/front/public/settings.json
@@ -1,3 +1,5 @@
{
- "additionalStylesheets": ["/custom.css"]
+ "additionalStylesheets": [
+ "/front/custom.css"
+ ]
}
diff --git a/front/src/store/instance.js b/front/src/store/instance.js
index dd0de956..20fa2457 100644
--- a/front/src/store/instance.js
+++ b/front/src/store/instance.js
@@ -123,7 +123,7 @@ export default {
})
},
fetchFrontSettings ({commit}) {
- return axios.get('/settings.json').then(response => {
+ return axios.get('/front/settings.json').then(response => {
commit('frontSettings', response.data)
}, response => {
logger.default.error('Error when fetching front-end configuration (or no customization available)')
--
GitLab