commit: 4e24ce2185aa4309ed9c3a239fa89d66989283d6
parent: 7b1d5a4f5c54e6ea549a3a69d180970305ff0715
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Thu, 5 Dec 2019 13:53:04 +0000
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
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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]'
}
})
]