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

2018-05-23 16:05:19 +02:00
parent 2289250f69 d8864b9e9d
commit e0ef89c73f
21 changed files with 295 additions and 70 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1984,6 +1984,7 @@ a.account__display-name {
  padding: 15px;
  margin: 0;
  z-index: 3;
+  outline: 0;

  &:hover {
    text-decoration: underline;