add grey lines - adequate spacing for action buttons

app/assets/stylesheets/pages/merge_requests.scss

@@ -344,15 +344,54 @@
   }
 }
 
+.remove-message-pipes {
+  ul {
+    margin-left: 6px;
+    margin-bottom: 20px;
+    padding-left: 0;
+    list-style: none;
+    border-left: 3px solid $border-color;
+  }
+
+  ul li:last-child {
+    margin-bottom: 0;
+  }
+
+  li {
+    height: 30px;
+    position: relative;
+    margin: -3px;
+    padding-bottom: 3px;
+  }
+
+  li span {
+    width: 20px;
+    display: inline-block;
+    height: 3px;
+    background: $border-color;
+    margin-right: 5px;
+    top: 16px;
+    position: relative;
+  }
+
+  li p {
+    display: inline-block;
+    margin: 0;
+    margin-bottom: -3px;
+    padding: 0;
+    position: relative;
+    top: 20px;
+  }
+}
+
 .mr-source-target {
-  background-color: #FAFAFA;
+  background-color: $gray-light;
   line-height: 31px;
   border-style: solid;
   border-width: 1px;
   border-color: $border-color;
   border-top-right-radius: 10px;
   border-top-left-radius: 10px;
-  border--radius: 0px;
   padding: 10px;
   margin-bottom: -1px;
 }

app/views/projects/merge_requests/widget/_merged.html.haml

@@ -7,27 +7,53 @@
         by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
         #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
     - if !@merge_request.source_branch_exists? || params[:deleted_source_branch]
+      .remove-message-pipes
+        %ul
+          %li
+            %span
             %p
               The changes were merged into
               #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
+          %li
+            %span
+            %p
               The source branch has been removed.
       = render 'projects/merge_requests/widget/merged_buttons'
     - elsif @merge_request.can_remove_source_branch?(current_user)
-      .remove_source_branch_widget
+      .remove_source_branch_widget.remove-message-pipes
+        %ul
+          %li
+            %span
             %p
               The changes were merged into
               #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
+          %li
+            %span
+            %p
               You can remove the source branch now.
         = render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true
-      .remove_source_branch_widget.failed.hide
+      .remove_source_branch_widget.failed.remove-message-pipes.hide
+        %ul
+          %li
+            %span
             %p
               Failed to remove source branch '#{@merge_request.source_branch}'.
-
-      .remove_source_branch_in_progress.hide
+      .remove_source_branch_in_progress.remove-message-pipes.hide
+        %ul
+          %li
+            %span
             %p
               = icon('spinner spin')
-          Removing source branch '#{@merge_request.source_branch}'. Please wait, this page will be automatically reloaded.
+              Removing source branch '#{@merge_request.source_branch}'.
+          %li
+            %span
+            %p
+              Please wait, this page will be automatically reloaded.
     - else
+      .remove-message-pipes
+        %ul
+          %li
+            %span
             %p
               The changes were merged into
               #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.

app/views/projects/merge_requests/widget/_merged_buttons.haml

@@ -9,6 +9,6 @@
         = icon('trash-o')
         Remove Source Branch
     - if mr_can_be_reverted
-      = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "warning")
+      = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "close")
     - if mr_can_be_cherry_picked
       = cherry_pick_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "default")

app/views/projects/merge_requests/widget/open/_conflicts.html.haml

@@ -3,10 +3,15 @@
 - can_merge = @merge_request.can_be_merged_via_command_line_by?(current_user)
 
 %h4.has-conflicts
+  %p
     = icon("exclamation-triangle")
     This merge request contains merge conflicts
 
-%p
+.remove-message-pipes
+  %ul
+    %li
+      %span
+      %p
         To merge this request, resolve these conflicts
         - if can_resolve && !can_resolve_in_ui
           locally