Merge branch 'master' of github.com:tootsuite/mastodon

2017-04-11 21:30:48 +02:00
parent 5f74397ef0 47aacb773b
commit 9f7ea77d0c
49 changed files with 32 additions and 2351 deletions
--- a/app/assets/images/background-photo.jpeg
+++ b/app/assets/images/background-photo.jpeg
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@ -149,7 +149,7 @@
    order: 1;
  }

-  @media screen and (max-width: 360px) {
+  @media screen and (max-width: 480px) {
    .details {
      display: block;
    }