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

2022-08-25 05:07:39 +02:00
parent 5a3d09dc8e 861b35dd54
commit 2d1d4210f9
67 changed files with 1420 additions and 194 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -5233,6 +5233,16 @@ a.status-card.compact:hover {
    line-height: 22px;
    color: lighten($inverted-text-color, 16%);
    margin-bottom: 30px;
+
+    a {
+      text-decoration: none;
+      color: $inverted-text-color;
+      font-weight: 500;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
  }

  &__actions {
@ -5379,6 +5389,14 @@ a.status-card.compact:hover {
    background: transparent;
    margin: 15px 0;
  }
+
+  .emoji-mart-search {
+    padding-right: 10px;
+  }
+
+  .emoji-mart-search-icon {
+    right: 10px + 5px;
+  }
 }

 .report-modal__container {