Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream

2023-07-12 15:44:33 +02:00
parent 71f8c45c18 ea10febd25
commit 075887e1d6
24 changed files with 275 additions and 237 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1670,10 +1670,6 @@ a.account__display-name {
  color: inherit;
 }

-.detailed-status .button.logo-button {
-  margin-bottom: 15px;
-}
-
 .detailed-status__display-name {
  color: $darker-text-color;
  display: flex;
@ -5784,6 +5780,7 @@ a.status-card.compact:hover {
  &__toggle {
    display: flex;
    align-items: center;
+    margin-bottom: 10px;

    & > span {
      font-size: 17px;