Merge branch 'kb_development' into kb_migration

2023-03-14 17:55:53 +09:00 · 2023-03-14 17:55:53 +09:00 · 49d032576a
commit 49d032576a
parent 33445ffeb2 4439f0255c
15 changed files with 159 additions and 7 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1287,6 +1287,12 @@ body > [data-popper-placement] {
    .emoji {
      display: block;
      height: 16px;
+      transition: transform .2s ease;
+
+      &:hover {
+        transform: scale(1.2);
+      }
+
      img {
        margin-top: 0;
        margin-bottom: 0;
--- a/app/javascript/styles/mastodon/rich_text.scss
+++ b/app/javascript/styles/mastodon/rich_text.scss
@ -86,6 +86,13 @@
    vertical-align: super;
  }

+  .emojione {
+    transition: transform .2s ease;
+
+    &:hover {
+      transform: scale(1.2);
+    }
+  }
 }

 .status__content__text {