config: chase pleroma-fe updates from MR pleroma-fe!324.

diff --git a/config/config.exs b/config/config.exs
index fa36209acb3e3b9bad30fd1ad706df7fd9df0f1f..20b55086c242d8a1d26a3010ba3f43de51af6a85 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -73,6 +73,8 @@ config :pleroma, :instance,
 config :pleroma, :fe,
   theme: "pleroma-dark",
   logo: "/static/logo.png",
+  logo_mask: true,
+  logo_margin: "0.1em",
   background: "/static/aurora_borealis.jpg",
   redirect_root_no_login: "/main/all",
   redirect_root_login: "/main/friends",

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index d1ecebf619c6f3d0fed094bf23f7a89301b96b55..68e9a47b7d2b1ebb48f1bc4e02554ad0ea16efd2 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -168,6 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
               theme: Keyword.get(@instance_fe, :theme),
               background: Keyword.get(@instance_fe, :background),
               logo: Keyword.get(@instance_fe, :logo),
+              logoMask: Keyword.get(@instance_fe, :logo_mask),
+              logoMargin: Keyword.get(@instance_fe, :logo_margin),
               redirectRootNoLogin: Keyword.get(@instance_fe, :redirect_root_no_login),
               redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
               chatDisabled: !Keyword.get(@instance_chat, :enabled),