Merge remote-tracking branch 'upstream/develop' into shigusegubu

* upstream/develop: (24 commits)
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
  [i18n] Improve easy/pedantic Japanese switching
  Normalize profile fields
  backend interactor service: implement startFetchingFollowRequest
  show badge visibility user setting checkbox only if needed
  Use kana+kanji as default for Japanese translation
  Remove outdated changelog file
  Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
  use yarn, try to restart pipeline
  tests + updates
  ...
This commit is contained in:
Henry Jameson 2019-12-10 23:08:45 +02:00
commit b6b7bc5852
50 changed files with 428 additions and 1149 deletions

View file

@ -11,21 +11,6 @@
<link rel="mask-icon" href="/ngs/safari-pinned-tab.svg" color="#370f34">
<meta name="theme-color" content="#370f34">
<!--server-generated-meta-->
<link rel="stylesheet" href="/static/font/css/fontello.css">
<link rel="stylesheet" href="/static/font/css/animation.css">
<style>
#app {
background-position: 50% 50px !important;
}
.media.status.USER____hj.highlighted .name-and-links::after {
content: 'admin';
display: inline;
font-size: 8px;
vertical-align: top;
line-height: 8px;
margin-left: 1em;
}
</style>
</head>
<body class="hidden">
<noscript>To use Pleroma, please enable JavaScript.</noscript>