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

2023-04-01 14:31:05 +02:00
parent d874a7a10f 46483ae849
commit 7b15f4006a
7 changed files with 37 additions and 32 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1427,15 +1427,6 @@ body > [data-popper-placement] {
  padding: 16px;
  border-bottom: 1px solid lighten($ui-base-color, 8%);

-  &.compact {
-    padding: 0;
-    border-bottom: 0;
-
-    .account__avatar-wrapper {
-      margin-inline-start: 0;
-    }
-  }
-
  .account__display-name {
    flex: 1 1 auto;
    display: flex;
@ -1455,6 +1446,18 @@ body > [data-popper-placement] {
    }
  }

+  &--minimal {
+    .account__display-name {
+      .display-name {
+        margin-bottom: 0;
+      }
+
+      .display-name strong {
+        display: block;
+      }
+    }
+  }
+
  &__note {
    white-space: nowrap;
    overflow: hidden;