Merge branch '23918-reaction-button-style' into 'master'

Correct padding and alignment for reaction buttons

## What does this MR do?
Fixes padding and alignment for reaction buttons on issues.

## Screenshots (if relevant)

### Before
![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ae788883aca84799fca9cd23f8e16f28/image.png)
![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2f5aa45dbb4899f054f839bd9046bb6/image.png)

### After
![Screen_Shot_2016-10-28_at_3.56.03_PM](/uploads/0b1affed448f6ec24fa56e7800daf753/Screen_Shot_2016-10-28_at_3.56.03_PM.png)
![Screen_Shot_2016-10-28_at_3.56.09_PM](/uploads/311bb59dc6eea8cd124232ebe647b5ef/Screen_Shot_2016-10-28_at_3.56.09_PM.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #23918

See merge request !7182

3 files changed, 5 insertions, 10 deletions

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index c0e9c8bf829..ed21ad83a1c 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -216,7 +216,7 @@
   svg,
   .fa {
     &:not(:last-child) {
-      margin-right: 3px;
+      margin-right: 5px;
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 9282e0ae03b..486ad16ea26 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,7 +1,7 @@
 .awards {
   .emoji-icon {
-    width: 20px;
-    height: 20px;
+    width: 19px;
+    height: 19px;
   }
 }
 
@@ -94,7 +94,7 @@
 
 .award-control {
   margin: 3px 5px 3px 0;
-  padding: 6px 5px;
+  padding: 5px 6px;
   outline: 0;
 
   &:hover,
@@ -127,7 +127,7 @@
   .award-control-icon {
     float: left;
     margin-right: 5px;
-    font-size: 20px;
+    font-size: 19px;
   }
 
   .award-control-icon-loading {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index b90c91831f2..526e9ae5cdd 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -105,11 +105,6 @@ ul.notes {
         padding: 2px;
         margin-top: 10px;
       }
-
-      .award-control {
-        font-size: 13px;
-        padding: 2px 5px;
-      }
     }
 
     .note-header {