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

2022-07-22 09:58:35 +02:00
parent 0a61b000e3 76ff452306
commit d799fe2082
50 changed files with 983 additions and 662 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1783,10 +1783,14 @@ a.account__display-name {
    object-fit: contain;
  }

-  .loading-bar {
+  .loading-bar__container {
    position: relative;
  }

+  .loading-bar {
+    position: absolute;
+  }
+
  &.image-loader--amorphous .image-loader__preview-canvas {
    display: none;
  }
@ -7239,6 +7243,13 @@ noscript {
      padding-right: 15px;
      margin-left: 5px;
      color: $secondary-text-color;
+      text-decoration: none;
+
+      &__asterisk {
+        color: $darker-text-color;
+        font-size: 18px;
+        vertical-align: super;
+      }
    }

    &__sparkline {