Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: spec/views/about/show.html.haml_spec.rb
2018-04-04 13:56:58 -05:00
parent bda1782cd8 1c1042556d
commit 3ab6a8b8be
9 changed files with 174 additions and 104 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1483,6 +1483,9 @@
  position: relative;
  width: 100%;
  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;

  img {
    max-width: $media-modal-media-max-width;