Merge branch '32631-issue-emoji-wrap' into 'master'

app/assets/stylesheets/framework/awards.scss

@@ -108,7 +108,7 @@
 }
 
 .award-control {
-  margin-right: 5px;
+  margin: 0 5px 6px 0;
   outline: 0;
 
   &.disabled {

app/assets/stylesheets/pages/issuable.scss

@@ -56,6 +56,10 @@
     padding: 5px;
     max-height: calc(100vh - 100px);
   }
+
+  .emoji-block {
+    padding: 10px 0 4px;
+  }
 }
 
 .issuable-filter-count {

app/views/projects/issues/show.html.haml

@@ -68,11 +68,11 @@
     #related-branches{ data: { url: related_branches_namespace_project_issue_url(@project.namespace, @project, @issue) } }
       // This element is filled in using JavaScript.
 
-  .content-block.content-block-small
+  .content-block.emoji-block
     .row
-      .col-sm-6
+      .col-sm-8
         = render 'award_emoji/awards_block', awardable: @issue, inline: true
-      .col-sm-6.new-branch-col
+      .col-sm-4.new-branch-col
         = render 'new_branch' unless @issue.confidential?
 
   %section.issuable-discussion