aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-12-05 13:53:04 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-12-05 13:53:04 +0000
commit4e24ce2185aa4309ed9c3a239fa89d66989283d6 (patch)
treef0d496eca953e1683d115eb780ebf18335a5054f
parent7b1d5a4f5c54e6ea549a3a69d180970305ff0715 (diff)
parent9aac873d6b50e6576578c0aac131971f6af4e4c4 (diff)
Merge branch 'fix-font-load-for-pleroma-be' into 'develop'
Change output directory of fontello Closes pleroma-support#14 See merge request pleroma/pleroma-fe!1021
-rw-r--r--build/webpack.base.conf.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index 9313ec20..5cc0135e 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -98,8 +98,8 @@ module.exports = {
config: require('../static/fontello.json'),
name: 'fontello',
output: {
- css: '[name].' + now + '.css', // [hash] is not supported. Use the current timestamp instead for versioning.
- font: 'font/[name].' + now + '.[ext]'
+ css: 'static/[name].' + now + '.css', // [hash] is not supported. Use the current timestamp instead for versioning.
+ font: 'static/font/[name].' + now + '.[ext]'
}
})
]