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

2023-07-17 12:52:15 +02:00
parent 23197cebce 626f9cf831
commit c943f17b1b
16 changed files with 161 additions and 118 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1423,6 +1423,7 @@ body > [data-popper-placement] {
 .detailed-status__link {
  color: inherit;
  text-decoration: none;
+  white-space: nowrap;
 }

 .detailed-status__favorites,
@@ -4389,7 +4390,7 @@ a.status-card.compact:hover {
 }

 .relationship-tag {
-  color: $primary-text-color;
+  color: $white;
  margin-bottom: 4px;
  display: block;
  background-color: rgba($black, 0.45);