Reduced number of buttons in commit header

Closes #17576

1 files changed, 15 insertions, 14 deletions

diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 028564c9305..d9dea067705 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -2,26 +2,27 @@
   %div
     - if defined?(@notes_count) && @notes_count > 0
       %span.btn.disabled.btn-grouped
-        %i.fa.fa-comment
+        = icon('comment')
         = @notes_count
-    .pull-left.btn-group
-      %a.btn.btn-grouped.dropdown-toggle{ data: {toggle: :dropdown} }
-        %i.fa.fa-download
-        Download as
+    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
+      Browse Files
+    .dropdown.inline
+      %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
+        Options
         %span.caret
-      %ul.dropdown-menu
+      %ul.dropdown-menu.dropdown-menu-align-right
+        - unless @commit.has_been_reverted?(current_user)
+          %li.clearfix
+            = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
+        %li.clearfix
+          = cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id), has_tooltip: false)
+        %li.divider
+        %li.dropdown-header
+          Download
         - unless @commit.parents.length > 1
           %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch)
         %li= link_to "Plain Diff",    namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff)
-    = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-grouped" do
-      = icon('files-o')
-      Browse Files
-    - unless @commit.has_been_reverted?(current_user)
-      = revert_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id))
-    = cherry_pick_commit_link(@commit, namespace_project_commit_path(@project.namespace, @project, @commit.id))
-  %div
 
-%p
 .commit-info-row
   %span.light Authored by
   %strong