IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4946 from jjaffeux/emoji-picker-fixes

Browse Source 
Emoji picker fixes
This commit is contained in:
Régis Hanol 2017-06-29 00:30:55 +02:00 committed by GitHub
commit e12601b850
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
View File

@ -168,9 +168,9 @@ function render(page, offset, options) {
} }
const model = { const model = {
toolbarItems: toolbarItems, toolbarItems,
skinTones: skinTones, skinTones,
rows: rows, rows,
prevDisabled: offset === 0, prevDisabled: offset === 0,
nextDisabled: (max + 1) > icons.length, nextDisabled: (max + 1) > icons.length,
modalClass: options.modalClass modalClass: options.modalClass

4
app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
View File

@ -18,9 +18,9 @@
<div class='info'></div> <div class='info'></div>
<div class='tones'> <div class='tones'>
{{#each skinTones as |skinTone|}} {{#each skinTones as |skinTone|}}
<button class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}"> <a href='#' class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
{{#if skinTone.selected}}{{fa-icon "check"}}{{/if}} {{#if skinTone.selected}}{{fa-icon "check"}}{{/if}}
</button> </a>
{{/each}} {{/each}}
</div> </div>
<div class='nav'> <div class='nav'>

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

@ -131,6 +131,7 @@ table.emoji-page td {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer;
} }
.emoji-modal .tones-button.default { background: #ffcc4d; } .emoji-modal .tones-button.default { background: #ffcc4d; }
.emoji-modal .tones-button.light { background: #f7dece; } .emoji-modal .tones-button.light { background: #f7dece; }