Merge branch 'awards-control-margin' into 'master'

Fix margin for awards-control buttons ## What does this MR do? Fixes margin in awards-control ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-06_at_10.58.03_AM](/uploads/b3fcd4103669bc7ae54a22093f492391/Screen_Shot_2016-09-06_at_10.58.03_AM.png) After: ![Screen_Shot_2016-09-06_at_10.54.54_AM](/uploads/dcd0e57a8cff82fe70990a9a8e2b1232/Screen_Shot_2016-09-06_at_10.54.54_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 you do - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21896 See merge request !6233

Merge branch 'awards-control-margin' into 'master'
60c8969b · Annabel Dunstone Gray · 7a3aeebb · 23157a3c · 60c8969b · 60c8969b
Commit 60c8969b authored Sep 08, 2016 by Annabel Dunstone Gray
4 changed files
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -249,6 +249,10 @@
  > .controls {
    float: right;
  }
+
+  .new-branch {
+    margin-top: 3px;
+  }
 }

 .content-block-small {

--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -93,11 +93,8 @@
 }

 .award-control {
-  margin-right: 5px;
-  margin-bottom: 5px;
-  padding-left: 5px;
-  padding-right: 5px;
-  line-height: 20px;
+  margin: 3px 5px 3px 0;
+  padding: 6px 5px;
  outline: 0;

  &:hover,

--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
 - if can?(current_user, :push_code, @project)
  .pull-right
-    #new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)}
+    #new-branch.new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)}
      = link_to '#', class: 'checking btn btn-grouped', disabled: 'disabled' do
        = icon('spinner spin')
        Checking branches

--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/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