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

update pleroma frontend See merge request pleroma/pleroma!311
2018-08-31 04:36:04 +00:00 · 2018-08-31 04:36:04 +00:00 · 03ecbe0456
commit 03ecbe0456
parent d40466c291 2b4b4888a9
16 changed files with 4 additions and 7 deletions
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.004e63f0a7e5719fbbe8.js></script><script type=text/javascript src=/static/js/vendor.48cf760f1485c83eb636.js></script><script type=text/javascript src=/static/js/app.d3eba781c5f30aabbb47.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f70689e27c09390170e6.js></script><script type=text/javascript src=/static/js/vendor.5cb6d04a9de200fd9af1.js></script><script type=text/javascript src=/static/js/app.6e2e9ee92450f3681b96.js></script></body></html>
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -2,14 +2,11 @@
  "theme": "pleroma-dark",
  "background": "/static/aurora_borealis.jpg",
  "logo": "/static/logo.png",
+  "logoMask": true,
+  "logoMargin": ".1em",
  "redirectRootNoLogin": "/main/all",
  "redirectRootLogin": "/main/friends",
  "chatDisabled": false,
-  "showWhoToFollowPanel": false,
-  "whoToFollowProvider": "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
-  "whoToFollowProviderDummy2": "https://followlink.osa-p.net/api/get_recommend.json?acct=@{{user}}@{{host}}",
-  "whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}",
-  "whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html",
  "showInstanceSpecificPanel": false,
  "scopeOptionsEnabled": false,
  "collapseMessageWithSubject": false
--- a/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css
+++ b/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css
--- a/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css.map
+++ b/priv/static/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css.map
--- a/priv/static/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css
+++ b/priv/static/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css
--- a/priv/static/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css.map
+++ b/priv/static/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css.map
--- a/priv/static/static/js/app.6e2e9ee92450f3681b96.js
+++ b/priv/static/static/js/app.6e2e9ee92450f3681b96.js
--- a/priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
+++ b/priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
--- a/priv/static/static/js/app.d3eba781c5f30aabbb47.js
+++ b/priv/static/static/js/app.d3eba781c5f30aabbb47.js
--- a/priv/static/static/js/app.d3eba781c5f30aabbb47.js.map
+++ b/priv/static/static/js/app.d3eba781c5f30aabbb47.js.map
--- a/priv/static/static/js/manifest.f70689e27c09390170e6.js
+++ b/priv/static/static/js/manifest.f70689e27c09390170e6.js
--- a/priv/static/static/js/manifest.f70689e27c09390170e6.js.map
+++ b/priv/static/static/js/manifest.f70689e27c09390170e6.js.map
--- a/priv/static/static/js/vendor.48cf760f1485c83eb636.js
+++ b/priv/static/static/js/vendor.48cf760f1485c83eb636.js
--- a/priv/static/static/js/vendor.48cf760f1485c83eb636.js.map
+++ b/priv/static/static/js/vendor.48cf760f1485c83eb636.js.map
--- a/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js
+++ b/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js
--- a/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map
+++ b/priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map