Merge branch...

Merge branch '24895-branch-index-delete-button-inconsistently-spaced-and-misaligned-ee' into 'master'

Port of 24895-branch-index-delete-button-inconsistently-spaced-and-misaligned to EE

See merge request !1111

app/assets/stylesheets/framework/lists.scss

@@ -155,7 +155,8 @@ ul.content-list {
       }
 
       > .btn,
-      > .btn-group {
+      > .btn-group,
+      > .dropdown.inline {
         margin-right: $gl-padding-top;
         display: inline-block;
         margin-top: 3px;

app/views/projects/branches/_branch.html.haml

@@ -24,7 +24,7 @@
         = icon('exclamation-triangle')
         diverged from upstream
 
-    .controls.hidden-xs
+    .controls.hidden-xs<
       - if merge_project && create_mr_button?(@repository.root_ref, branch.name)
         = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do
           Merge Request

app/views/projects/branches/index.html.haml

@@ -12,7 +12,7 @@
       = form_tag(filter_branches_path, method: :get) do
         = search_field_tag :search, params[:search], { placeholder: 'Filter by branch name', id: 'branch-search', class: 'form-control search-text-input input-short', spellcheck: false }
 
-      .dropdown.inline
+      .dropdown.inline>
         %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
           %span.light
             = projects_sort_options_hash[@sort]

app/views/projects/buttons/_download.html.haml

 - if !project.empty_repo? && can?(current_user, :download_code, project)
-  .project-action-button.dropdown.inline
+  .project-action-button.dropdown.inline>
     %button.btn{ 'data-toggle' => 'dropdown' }
       = icon('download')
       = icon("caret-down")