Merge branch 'master' into glitch-soc/merge-upstream

2019-06-11 21:55:00 +02:00
parent c64eef1206 4913c345b2
commit 7065ba5930
15 changed files with 374 additions and 151 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3075,6 +3075,10 @@ a.status-card.compact:hover {
  display: flex;
 }

+.column-header__links {
+  margin-bottom: 14px;
+}
+
 .column-header__links .text-btn {
  margin-right: 10px;
 }