logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: d40466c291e54bcc31b2ea7ac772ba8229e9547b
parent: a26d5e6b2aba5010c699df659d63048957b347a5
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 31 Aug 2018 04:06:18 +0000

Merge branch 'update/pleroma-fe-config-20180831' into 'develop'

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

See merge request pleroma/pleroma!310

Diffstat:

Mconfig/config.exs2++
Mlib/pleroma/web/twitter_api/controllers/util_controller.ex2++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git 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 @@ -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),