diff options
| author | Maciek Baron <thebezet@gmail.com> | 2018-09-25 04:08:55 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-25 05:08:55 +0200 |
| commit | 4b794e134d427dbc716606324adb9a885a74abec (patch) | |
| tree | 70289c00b4a23042dc75a6f498a4d5eb4cbf9944 /app/javascript/mastodon/common.js | |
| parent | 8864009e8d26d0496bec41d53255fd2cfc3f7cc4 (diff) | |
Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)
* Migrate to newer version of Font Awesome * Add bot icon to bot avatars
Diffstat (limited to 'app/javascript/mastodon/common.js')
| -rw-r--r-- | app/javascript/mastodon/common.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js index 2b10b8c30..fdd3431ab 100644 --- a/app/javascript/mastodon/common.js +++ b/app/javascript/mastodon/common.js @@ -1,7 +1,8 @@ import Rails from 'rails-ujs'; export function start() { - require('font-awesome/css/font-awesome.css'); + require('@fortawesome/fontawesome-free/css/fontawesome.css'); + require('@fortawesome/fontawesome-free/css/solid.css'); require.context('../images/', true); Rails.start(); |