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

Emoji picker fixes

app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6

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

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

@@ -18,9 +18,9 @@
     <div class='info'></div>
     <div class='tones'>
       {{#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}}
-        </button>
+        </a>
       {{/each}}
     </div>
     <div class='nav'>

app/assets/stylesheets/common/base/emoji.scss

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