From: William Pitcock Date: Fri, 31 Aug 2018 04:01:21 +0000 (+0000) Subject: config: chase pleroma-fe updates from MR pleroma-fe!324. X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=856b5e1ca4d84e097cb78dbf34cf9861faa25e5e;p=akkoma config: chase pleroma-fe updates from MR pleroma-fe!324. --- diff --git a/config/config.exs b/config/config.exs index fa36209ac..20b55086c 100644 --- 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 d1ecebf61..68e9a47b7 100644 --- 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),