diff --git a/config/config.exs b/config/config.exs index 5d3f4eebf5..3d73263d21 100644 --- a/config/config.exs +++ b/config/config.exs @@ -163,8 +163,13 @@ description: "Pleroma: An efficient and flexible fediverse server", short_description: "", background_image: "/images/city.jpg", +<<<<<<< HEAD instance_thumbnail: "/instance/thumbnail.jpeg", favicon: "/favicon.png", +======= + instance_thumbnail: "/instance/thumbnail.png", + favicon: "/favicon.svg", +>>>>>>> 0f1452566e (Change default favicon) limit: 5_000, description_limit: 5_000, remote_limit: 100_000, diff --git a/config/soapbox.exs b/config/soapbox.exs index b7f270e7a8..ab90181c9c 100644 --- a/config/soapbox.exs +++ b/config/soapbox.exs @@ -50,6 +50,7 @@ name: "Soapbox", description: "Social media owned by you", instance_thumbnail: "/instance/thumbnail.png", + favicon: "/favicon.svg", account_approval_required: true, moderator_privileges: [ :users_read, diff --git a/lib/pleroma/constants.ex b/lib/pleroma/constants.ex index 1e45c28072..df0158e78b 100644 --- a/lib/pleroma/constants.ex +++ b/lib/pleroma/constants.ex @@ -33,7 +33,7 @@ defmodule Pleroma.Constants do const(static_only_files, do: - ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css) + ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png favicon.svg schemas doc embed.js embed.css) ) const(status_updatable_fields, diff --git a/priv/static/favicon.svg b/priv/static/favicon.svg new file mode 100644 index 0000000000..73574c638d --- /dev/null +++ b/priv/static/favicon.svg @@ -0,0 +1,3537 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +