diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index 6431d1007d1..273dd6de9fd 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -31,17 +31,10 @@ class SiteUpload < ApplicationRecord
[:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
end.freeze,
- favicon: {
- ico: {
- format: 'ico',
- geometry: '48x48#',
- file_geometry_parser: FastGeometryParser,
- }.freeze,
- }.merge(
+ favicon:
FAVICON_SIZES.to_h do |size|
[:"#{size}", { format: 'png', geometry: "#{size}x#{size}#", file_geometry_parser: FastGeometryParser }]
- end
- ).freeze,
+ end.freeze,
thumbnail: {
'@1x': {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e7f1a595e53..0c0512e812f 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,8 +11,6 @@
- if storage_host?
%link{ rel: 'dns-prefetch', href: storage_host }/
- %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
-
- SiteUpload::FAVICON_SIZES.each do |size|
%link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
diff --git a/config/imagemagick/policy.xml b/config/imagemagick/policy.xml
index 2730a9f84e3..e2aa202f274 100644
--- a/config/imagemagick/policy.xml
+++ b/config/imagemagick/policy.xml
@@ -23,5 +23,5 @@
-
+
diff --git a/lib/tasks/branding.rake b/lib/tasks/branding.rake
index 608fb3af9c4..be72454ce29 100644
--- a/lib/tasks/branding.rake
+++ b/lib/tasks/branding.rake
@@ -42,7 +42,6 @@ namespace :branding do
output_dest = Rails.root.join('app', 'javascript', 'icons')
rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output')
- convert = Terrapin::CommandLine.new('convert', ':input :output', environment: { 'MAGICK_CONFIGURE_PATH' => nil })
favicon_sizes = [16, 32, 48]
apple_icon_sizes = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024]
@@ -56,8 +55,6 @@ namespace :branding do
rsvg_convert.run(size: size, input: favicon_source, output: output_path)
end
- convert.run(input: favicons, output: Rails.public_path.join('favicon.ico'))
-
apple_icon_sizes.each do |size|
rsvg_convert.run(size: size, input: app_icon_source, output: output_dest.join("apple-touch-icon-#{size}x#{size}.png"))
end
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index b09a98bb9b0..00000000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/spec/requests/account_show_page_spec.rb b/spec/requests/account_show_page_spec.rb
index 81e965e6e6c..830d7786081 100644
--- a/spec/requests/account_show_page_spec.rb
+++ b/spec/requests/account_show_page_spec.rb
@@ -9,7 +9,7 @@ describe 'The account show page' do
get '/@alice'
- expect(head_link_icons.size).to eq(4) # One general favicon and three with sizes
+ expect(head_link_icons.size).to eq(3) # Three favicons with sizes
expect(head_meta_content('og:title')).to match alice.display_name
expect(head_meta_content('og:type')).to eq 'profile'