Merge branch '54725-fix-emoji-button-active-state' into 'master'

Resolve "Add reaction emoji styling is off"

See merge request gitlab-org/gitlab-ce!25295

app/assets/stylesheets/framework/awards.scss

@@ -233,10 +233,10 @@
       height: $default-icon-size;
       width: $default-icon-size;
       border-radius: 50%;
+    }
 
-      path {
-        fill: $border-gray-normal;
-      }
+    path {
+      fill: $border-gray-normal;
     }
   }
 
@@ -247,6 +247,10 @@
     left: 10px;
     bottom: 6px;
     opacity: 0;
+
+    path {
+      fill: $award-emoji-positive-add-lines;
+    }
   }
 
   .award-control-text {

changelogs/unreleased/54725-fix-emoji-button-active-state.yml

+---
+title: Fix hover and active state colors of award emoji button
+merge_request: 25295
+author:
+type: fixed