Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4107 from gdpelican/fix/long-emoji-styles 

Fix for long emoji names in autocomplete
This commit is contained in:
Jeff Atwood 2016-03-22 12:53:45 -07:00
parent c1fd896128 9acaecac4a
commit e8e9ce3a0b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
View File

@ -4,7 +4,8 @@
<li> <li>
<a href> <a href>
{{#if option.src}} {{#if option.src}}
<img src={{option.src}} class='emoji'> {{option.code}} <img src={{option.src}} class='emoji'>
<span class='emoji-shortname'>{{option.code}}</span>
{{else}} {{else}}
{{option.label}} {{option.label}}
{{/if}} {{/if}}

8
app/assets/stylesheets/common/base/emoji.scss
View File

@ -100,3 +100,11 @@ table.emoji-page td {
.emoji-modal .nav a { .emoji-modal .nav a {
color: dark-light-choose(#333, #ccc); color: dark-light-choose(#333, #ccc);
} }
.emoji-shortname {
display: inline-block;
max-width: 200px;
text-overflow: ellipsis;
overflow: hidden;
vertical-align: middle;
}