Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4432,6 +4432,10 @@ a.status-card {
  max-width: 100%;
  border-radius: 4px;

+  &:focus {
+    outline: 0;
+  }
+
  video {
    max-width: 100vw;
    max-height: 80vh;