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

Conflicts: - config/locales/simple_form.pl.yml
2019-01-16 14:20:07 +01:00
parent 077639c274 5363c724fc
commit dbe311f0e9
51 changed files with 1065 additions and 275 deletions
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -1041,10 +1041,6 @@ $small-breakpoint: 960px;

    .scrollable {
      height: 400px;
-
-      @media screen and (max-width: $column-breakpoint) {
-        height: 90vh;
-      }
    }

    p {
@@ -1271,8 +1267,7 @@ $small-breakpoint: 960px;
      }

      #mastodon-timeline {
-        display: block;
-        width: 100vw;
+        display: flex;
        height: 100vh;
        border-radius: 0;
      }