From eec4751bd0865498a925e89930465b40ea849ea2 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 11 Dec 2015 16:34:07 +0200
Subject: Add hover-state for emoji in emoji-picker

---
 CHANGELOG                                  |  1 +
 app/assets/stylesheets/pages/issuable.scss | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 61068d3efb1..155048b95c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.3.0 (unreleased)
   - Accept COPYING,COPYING.lesser, and licence as license file (Zeger-Jan van de Weg)
   - Fix emoji aliases problem
   - Fix award-emojis Flash alert's width
+  - Emoji picker improvements
 
 v 8.2.3
   - Fix application settings cache not expiring after changes (Stan Hu)
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 957da5c182e..5b5e73e465d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -129,10 +129,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;
       }
@@ -170,7 +178,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;
+        }
       }
     }
   }
-- 
cgit v1.2.1