mastofe

commit: 3f16caaa50beae1ea4a4e2df5820f5cca627d2be
parent: 5d5c0f4f4358f4349d9e2db59cf90b1f5de24e81
Author: nullkal <nullkal@nil.nu>
Date:   Wed,  8 Nov 2017 03:09:53 +0900

Eliminate space around emoji (#5474)

* Eliminate space around emoji

* More improve emoji style

* Make more compatible with Twemoji

* Make scss-lint happy

* Make not modify normal emoji's behavior

* Decrease status__action-bar's margin-top to 5px

* Make the test be passed

* Revert "Make the test be passed"

This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece.

* Revert "Make not modify normal emoji's behavior"

This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.

Diffstat:
M
app/javascript/styles/mastodon/components.scss
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
@@ -519,6 +519,7 @@
   font-weight: 400;
   overflow: hidden;
   white-space: pre-wrap;
+  padding-top: 5px;
 
   &.status__content--with-spoiler {
     white-space: normal;
@@ -529,8 +530,9 @@
   }
 
   .emojione {
-    width: 18px;
-    height: 18px;
+    width: 20px;
+    height: 20px;
+    margin: -5px 0 0;
   }
 
   p {
@@ -766,7 +768,7 @@
 .status__action-bar {
   align-items: center;
   display: flex;
-  margin-top: 10px;
+  margin-top: 5px;
 }
 
 .status__action-bar-button {
@@ -797,8 +799,9 @@
     line-height: 24px;
 
     .emojione {
-      width: 22px;
-      height: 22px;
+      width: 24px;
+      height: 24px;
+      margin: -5px 0 0;
     }
   }