diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-28 02:11:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 02:11:14 +0200 |
| commit | 3d7f68c273f03497ff555acac70355ba1815f7a2 (patch) | |
| tree | 497eee9463a7d6e4b711d2d810a5e91aa4baa5e3 /app/javascript/mastodon/common.js | |
| parent | 4b78546135b141da9998d284bcba3107d98fe951 (diff) | |
Revert Font Awesome 5 upgrade (#8810)
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82c1a3879a2b092672f51c1caca76f5c. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945fea5afffb3e3a53279164adfc6e88f. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da484fc35ecd4b4dce2443d24aa35d23. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d427dbc716606324adb9a885a74abec.
Diffstat (limited to 'app/javascript/mastodon/common.js')
| -rw-r--r-- | app/javascript/mastodon/common.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js index fdd3431ab..2b10b8c30 100644 --- a/app/javascript/mastodon/common.js +++ b/app/javascript/mastodon/common.js @@ -1,8 +1,7 @@ import Rails from 'rails-ujs'; export function start() { - require('@fortawesome/fontawesome-free/css/fontawesome.css'); - require('@fortawesome/fontawesome-free/css/solid.css'); + require('font-awesome/css/font-awesome.css'); require.context('../images/', true); Rails.start(); |