From 9bdd113035be84220d5c1d66ef52e86972ef23ba Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Thu, 29 Jun 2017 18:09:21 +0000
Subject: [PATCH] Resolve "Select branch dropdown is too close to branch name"

---
 app/assets/stylesheets/pages/tree.scss    |  6 ++++
 app/views/projects/commits/show.html.haml | 35 ++++++++++++-----------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 9b2ed0d68a1..dc88cf3e699 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,4 +1,5 @@
 .tree-holder {
+
   .nav-block {
     margin: 10px 0;
 
@@ -15,6 +16,11 @@
         .btn-group {
           margin-left: 10px;
         }
+
+        .control {
+          float: left;
+          margin-left: 10px;
+        }
       }
 
       .tree-ref-holder {
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index fabd825aec8..7ed7e441344 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -8,27 +8,28 @@
   = render "head"
 
 %div{ class: container_class }
-  .row-content-block.second-block.content-component-block.flex-container-block
-    .tree-ref-holder
-      = render 'shared/ref_switcher', destination: 'commits'
+  .tree-holder
+    .nav-block
+      .tree-ref-container
+        .tree-ref-holder
+          = render 'shared/ref_switcher', destination: 'commits'
 
-    %ul.breadcrumb.repo-breadcrumb
-      = commits_breadcrumbs
+        %ul.breadcrumb.repo-breadcrumb
+          = commits_breadcrumbs
+      .tree-controls.hidden-xs.hidden-sm
+        - if @merge_request.present?
+          .control
+            = link_to _("View open merge request"), namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
+        - elsif create_mr_button?(@repository.root_ref, @ref)
+          .control
+            = link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
 
-    .block-controls.hidden-xs.hidden-sm
-      - if @merge_request.present?
         .control
-          = link_to _("View open merge request"), namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
-      - elsif create_mr_button?(@repository.root_ref, @ref)
+          = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do
+            = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
         .control
-          = link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
-
-      .control
-        = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do
-          = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
-      .control
-        = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
-          = icon("rss")
+          = link_to namespace_project_commits_path(@project.namespace, @project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
+            = icon("rss")
 
   %div{ id: dom_id(@project) }
     %ol#commits-list.list-unstyled.content_list