Skip to content

Commit

Permalink
Fixes #794 by moving emoji tag to the correct span (#848)
Browse files Browse the repository at this point in the history 
Signed-off-by: Stephen Brown <steve@evolvedlight.co.uk>
  • Loading branch information
@evolvedlight @lunny
evolvedlight authored and lunny committed Feb 6, 2017
1 parent 71d35da commit 94130da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/repo/commits_table.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
{{end}}
</td>

<td class="message collapsing has-emoji">
<td class="message collapsing">
<a rel="nofollow" class="ui sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}">{{ShortSha .ID.String}}</a>
<span {{if gt .ParentCount 1}}class="grey text"{{end}}>{{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}}</span>
<span class="has-emoji{{if gt .ParentCount 1}} grey text{{end}}">{{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}}</span>

This comment has been minimized.

Sign in to view

Copy link
@ralphtheninja

ralphtheninja Feb 15, 2017

👍

This comment has been minimized.

Sign in to view

Copy link
@ralphtheninja

ralphtheninja Feb 15, 2017

Somewhat unrelated: Is it possible to add custom emojis to gitea? Preferrably without having to rebuild a fork of it.

This comment has been minimized.

Sign in to view

Copy link
@ralphtheninja

ralphtheninja Feb 15, 2017

cc @evolvedlight
</td>
<td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td>
</tr>
Expand Down

5 comments on commit 94130da

@evolvedlight
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not currently. It uses http://hassankhan.me/emojify.js/ and all the emojis are in https://github.com/go-gitea/gitea/tree/master/public/img/emoji. I guess it'd be possible to extend this in a custom way but I don't think this currently exists.

@ralphtheninja
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the emojis built into the go binary somehow?

@evolvedlight
Copy link
Contributor Author

@evolvedlight evolvedlight commented on 94130da Feb 15, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ralphtheninja
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evolvedlight Thanks! :)

@tboerger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But with 1.1.0 you will be able to extend/overwrite the public folder, just put the files into custom/public/img/emoji and the files will be served, but I don't know how emojify.js can handle these additional images.

Please sign in to comment.