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

2020-01-28 19:15:03 +01:00
parent 67b8af34b3 1051de0165
commit 44744e3ce1
11 changed files with 232 additions and 39 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -5761,8 +5761,8 @@ a.status-card.compact:hover {
    text-align: center;
    text-decoration: none;
    position: relative;
-    overflow: hidden;
    width: 100%;
+    white-space: nowrap;

    &.active {
      color: $secondary-text-color;