From b2c2cd28f1cd884616acfa5557fed72ce4b1eb43 Mon Sep 17 00:00:00 2001
From: Dimitrie Hoekstra <dimitrie@gitlab.com>
Date: Wed, 22 Mar 2017 00:59:23 +0000
Subject: [PATCH] Removed unnecessary 'add' text in additional award emoji
 button

---
 app/assets/stylesheets/framework/awards.scss             | 9 +++++++++
 app/views/award_emoji/_awards_block.html.haml            | 6 +++---
 .../unreleased/cleaner-additional-award-emoji-button.yml | 4 ++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/cleaner-additional-award-emoji-button.yml

diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index 546718ddaf8..1ae144fb471 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -92,6 +92,10 @@
 .award-menu-holder {
   display: inline-block;
   position: relative;
+
+  .tooltip {
+    white-space: nowrap;
+  }
 }
 
 .award-control {
@@ -124,6 +128,10 @@
     &:focus {
       outline: 0;
     }
+
+    .award-control-icon {
+      margin: 0;
+    }
   }
 
   &.is-loading {
@@ -153,6 +161,7 @@
   .award-control-icon {
     color: $border-gray-normal;
     margin-top: 1px;
+    padding: 0 2px;
   }
 
   .award-control-text {
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml
index a1ef34dc588..5aae410a63f 100644
--- a/app/views/award_emoji/_awards_block.html.haml
+++ b/app/views/award_emoji/_awards_block.html.haml
@@ -10,8 +10,8 @@
 
   - if current_user
     .award-menu-holder.js-award-holder
-      %button.btn.award-control.js-add-award{ type: "button" }
+      %button.btn.award-control.has-tooltip.js-add-award{ type: 'button',
+        'aria-label': 'Add emoji',
+        data: { title: 'Add emoji', placement: "bottom" } }
         = icon('smile-o', class: "award-control-icon award-control-icon-normal")
         = icon('spinner spin', class: "award-control-icon award-control-icon-loading")
-        %span.award-control-text
-          Add
diff --git a/changelogs/unreleased/cleaner-additional-award-emoji-button.yml b/changelogs/unreleased/cleaner-additional-award-emoji-button.yml
new file mode 100644
index 00000000000..84685f4bd45
--- /dev/null
+++ b/changelogs/unreleased/cleaner-additional-award-emoji-button.yml
@@ -0,0 +1,4 @@
+---
+title: Removed unnecessary 'add' text in additional award emoji button
+merge_request:
+author: