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

2019-02-28 21:35:53 +01:00
parent 76ed481aa7 ee7d79c0ce
commit 2267eee356
22 changed files with 417 additions and 21 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2336,6 +2336,7 @@ a.account__display-name {

 .getting-started {
  color: $dark-text-color;
+  overflow: auto;

  &__footer {
    flex: 0 0 auto;