Merge branch 'improve_emoji'

CHANGELOG

@@ -49,6 +49,7 @@ v 8.3.0 (unreleased)
   - Fix deleting notes on a merge request diff
   - Display referenced merge request statuses in the issue description (Greg Smethells)
   - Implement new sidebar for issue and merge request pages
+  - Emoji picker improvements
 
 v 8.2.3
   - Fix application settings cache not expiring after changes (Stan Hu)

app/assets/stylesheets/pages/awards.scss

@@ -12,10 +12,18 @@
     border-color: $border-color;
     cursor: pointer;
 
+    &:hover {
+      background-color: #dce0e5;
+    }
+
     &.active {
       border-color: $border-gray-light;
       background-color: $gray-light;
 
+      &:hover {
+        background-color: #dce0e5;
+      }
+
       .counter {
         font-weight: bold;
       }
@@ -53,7 +61,18 @@
 
       > li {
         cursor: pointer;
-        margin: 5px;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        @include border-radius(5px);
+
+        img {
+          margin-bottom: 2px;
+        }
+
+        &:hover {
+          background-color: #ccc;
+        }
       }
     }
   }