fix margin for awards-control buttons

app/assets/stylesheets/pages/awards.scss

@@ -94,10 +94,8 @@
 
 .award-control {
   margin-right: 5px;
-  margin-bottom: 5px;
   padding-left: 5px;
   padding-right: 5px;
-  line-height: 20px;
   outline: 0;
 
   &:hover,

app/views/projects/merge_requests/_show.html.haml

@@ -83,7 +83,7 @@
 
       .tab-content#diff-notes-app
         #notes.notes.tab-pane.voting_notes
-          .content-block.content-block-small.oneline-block
+          .content-block.content-block-small
             = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
 
           .row