Browse Source

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 54a8c60e59.

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

This reverts commit 6a5bdf0c11.
master
nullkal 7 years ago
committed by Eugen Rochko
parent
commit
3f16caaa50
1 changed files with 8 additions and 5 deletions
  1. +8
    -5
      app/javascript/styles/mastodon/components.scss

+ 8
- 5
app/javascript/styles/mastodon/components.scss View File

@ -519,6 +519,7 @@
font-weight: 400; font-weight: 400;
overflow: hidden; overflow: hidden;
white-space: pre-wrap; white-space: pre-wrap;
padding-top: 5px;
&.status__content--with-spoiler { &.status__content--with-spoiler {
white-space: normal; white-space: normal;
@ -529,8 +530,9 @@
} }
.emojione { .emojione {
width: 18px;
height: 18px;
width: 20px;
height: 20px;
margin: -5px 0 0;
} }
p { p {
@ -766,7 +768,7 @@
.status__action-bar { .status__action-bar {
align-items: center; align-items: center;
display: flex; display: flex;
margin-top: 10px;
margin-top: 5px;
} }
.status__action-bar-button { .status__action-bar-button {
@ -797,8 +799,9 @@
line-height: 24px; line-height: 24px;
.emojione { .emojione {
width: 22px;
height: 22px;
width: 24px;
height: 24px;
margin: -5px 0 0;
} }
} }

Loading…
Cancel
Save