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

2019-05-30 13:31:01 +02:00
parent 6c0428b7d8 dee4f1878d
commit 06036081a0
17 changed files with 407 additions and 271 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1976,6 +1976,7 @@ a.account__display-name {
 .columns-area--mobile {
  flex-direction: column;
  width: 100%;
+  height: 100%;
  margin: 0 auto;

  .column,