Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport emoji fixes to 1.12 #12327

Merged
merged 2 commits into from
Jul 25, 2020
Merged

Backport emoji fixes to 1.12 #12327

merged 2 commits into from
Jul 25, 2020

Conversation

silverwind
Copy link
Member

Backport both #12320 and #12317 to 1.12. Was a clean cherry-pick.

mrsdizzie and others added 2 commits July 25, 2020 17:18
@mrsdizzie @lafriks @silverwind
Fix emoji detection in certain cases (go-gitea#12320)
9a79b47 
* Fix emoji detection certain cases

Previous tests weren't complicated enough so there were some situations where emojis were't detected properly. Find the earliest occurance in addition to checking for the longest combination.

Fixes go-gitea#12312

* ok spell bot

Co-authored-by: Lauris BH <lauris@nix.lv>
@silverwind
Reduce emoji size (go-gitea#12317)
e7d18be 
* Reduce emoji size

Rendering should now pretty much match GitHub with 1.25em. I verified
that emojis don't increase the line height and removed unecessary size
overrides because now all emojis should appear similar in relation to
the font size.

* fix reaction hover
@silverwind silverwind mentioned this pull request Jul 25, 2020
Merged
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 25, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 25, 2020
@techknowlogick techknowlogick merged commit ad68c9c into go-gitea:release/v1.12 Jul 25, 2020
@silverwind
Copy link
Member Author

silverwind commented Jul 25, 2020 •
edited
Loading

Should probably not have squash-merged this one 😉

@silverwind silverwind deleted the backport-emoji branch July 25, 2020 16:56
@lafriks lafriks added this to the 1.12.3 milestone Jul 25, 2020
@lafriks lafriks added the topic/ui Change the appearance of the Gitea UI label Jul 25, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@mrsdizzie mrsdizzie mrsdizzie approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.12.3
Development

Successfully merging this pull request may close these issues.
6 participants
@silverwind @mrsdizzie @6543 @techknowlogick @lafriks @GiteaBot