diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js index 511568aa0f..28857de534 100644 --- a/app/javascript/mastodon/common.js +++ b/app/javascript/mastodon/common.js @@ -1,5 +1,4 @@ import Rails from '@rails/ujs'; -import 'font-awesome/css/font-awesome.css'; export function start() { require.context('../images/', true, /\.(jpg|png|svg)$/); diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 0c0512e812..a6b34c8a36 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -25,7 +25,6 @@ %title= html_title - = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' = theme_style_tags current_theme -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id` = stylesheet_pack_tag 'inert', media: 'all', crossorigin: 'anonymous', id: 'inert-style' diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index f912b3fafd..9258e80833 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -11,7 +11,6 @@ - if storage_host? %link{ rel: 'dns-prefetch', href: storage_host }/ - = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' = theme_style_tags Setting.theme # Use the admin-configured theme here, even if logged in = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' = preload_pack_asset "locale/#{I18n.locale}-json.js" diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index 485a69c909..0e4a27d1fc 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -5,7 +5,6 @@ %meta{ charset: 'utf-8' }/ %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ') %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ - = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous' = theme_style_tags Setting.default_settings['theme'] = javascript_pack_tag 'common', crossorigin: 'anonymous' = javascript_pack_tag 'error', crossorigin: 'anonymous' diff --git a/package.json b/package.json index 321a78598d..8ccbc31d39 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "emoji-mart": "npm:emoji-mart-lazyload@latest", "escape-html": "^1.0.3", "file-loader": "^6.2.0", - "font-awesome": "^4.7.0", "fuzzysort": "^3.0.0", "glob": "^10.2.6", "history": "^4.10.1", diff --git a/yarn.lock b/yarn.lock index 5f116021a0..c3dc1c5d3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2856,7 +2856,6 @@ __metadata: eslint-plugin-react: "npm:^7.33.2" eslint-plugin-react-hooks: "npm:^4.6.0" file-loader: "npm:^6.2.0" - font-awesome: "npm:^4.7.0" fuzzysort: "npm:^3.0.0" glob: "npm:^10.2.6" history: "npm:^4.10.1" @@ -8704,13 +8703,6 @@ __metadata: languageName: node linkType: hard -"font-awesome@npm:^4.7.0": - version: 4.7.0 - resolution: "font-awesome@npm:4.7.0" - checksum: 10c0/1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7 - languageName: node - linkType: hard - "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3"