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

2023-09-15 21:06:45 +02:00
parent 9f3df3edee b1d8907138
commit 08b495d95c
33 changed files with 759 additions and 327 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -8877,7 +8877,6 @@ noscript {
  border-radius: 8px;
  border: 1px solid $highlight-text-color;
  background: rgba($highlight-text-color, 0.15);
-  padding-inline-end: 45px;
  overflow: hidden;

  &__background-image {
@@ -8940,7 +8939,7 @@ noscript {
    position: absolute;
    inset-inline-end: 0;
    top: 0;
-    padding: 10px;
+    padding: 15px 10px;

    .icon-button {
      color: $highlight-text-color;