kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ui/emoji' into 'master' 

UI: Award emoji tweaks

Before:

![emoji_before](/uploads/82786924d3cea0313321b9dde0356cd2/emoji_before.png)

After:

![emoji_after](/uploads/07e94401701d7a622c3ed5cbaa148244/emoji_after.png)

See merge request !1960
This commit is contained in:
Dmitriy Zaporozhets 2015-12-03 14:10:49 +00:00
parent 6689224a90 535d9306c1
commit b5103a83a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/pages/issuable.scss
View File

@ -158,6 +158,7 @@
min-width: 214px;
> li {
cursor: pointer;
margin: 5px;
}
}

2
app/helpers/issues_helper.rb
View File

@ -96,7 +96,7 @@ module IssuesHelper
def emoji_author_list(notes, current_user)
list = notes.map do |note|
note.author == current_user ? "me" : note.author.username
note.author == current_user ? "me" : note.author.name
end
list.join(", ")