cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
nullkal 2017-11-08 03:09:53 +09:00 committed by Eugen Rochko
parent 5d5c0f4f43
commit 3f16caaa50
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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; width: 20px;
height: 18px; 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; width: 24px;
height: 22px; height: 24px;
margin: -5px 0 0;
} }
} }