First UX review changes

app/assets/stylesheets/framework/dropdowns.scss

@@ -299,8 +299,7 @@
   .description {
     display: inline-block;
     white-space: normal;
-    margin-left: 8px;
-    padding-right: 33px;
+    margin-left: 5px;
   }
 
   .dropdown-toggle > i {
@@ -308,10 +307,11 @@
   }
 
   li {
-    padding-top: 6px;
+    padding: $gl-btn-padding $gl-btn-padding 2px;
 
     > a,
     > button {
+      display: flex;
       margin: 0;
       padding: 0;
       border-radius: 0;
@@ -328,7 +328,6 @@
       }
 
       &.btn .fa:not(:last-child) {
-        margin-right: 0;
         margin-left: 5px;
       }
     }

app/views/projects/issues/show.html.haml

@@ -30,21 +30,16 @@
       .dropdown-menu.dropdown-menu-align-right.hidden-lg
         %ul
           - if can_update_issue
-            %li
-              = link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
-            %li
-              = link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
-            %li
-              = link_to 'Edit', edit_project_issue_path(@project, @issue)
-          %li
-            = link_to 'Report abuse', new_abuse_report_path(user_id: @issue.author.id, ref_url: issue_url(@issue))
+            %li= link_to 'Edit', edit_project_issue_path(@project, @issue)
+          %li= link_to 'Report abuse', new_abuse_report_path(user_id: @issue.author.id, ref_url: issue_url(@issue))
+          - if can_update_issue
+            %li= link_to 'Close issue', issue_path(@issue, issue: { state_event: :close }, format: 'json'), class: "btn-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
+            %li= link_to 'Reopen issue', issue_path(@issue, issue: { state_event: :reopen }, format: 'json'), class: "btn-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
           - if can_report_spam
-            %li
-              = link_to 'Submit as spam', mark_as_spam_project_issue_path(@project, @issue), method: :post, class: 'btn-spam', title: 'Submit as spam'
+            %li= link_to 'Submit as spam', mark_as_spam_project_issue_path(@project, @issue), method: :post, class: 'btn-spam', title: 'Submit as spam'
           - if can_update_issue || can_report_spam
             %li.divider
-          %li
-            = link_to 'New issue', new_project_issue_path(@project), title: 'New issue', id: 'new_issue_link'
+          %li= link_to 'New issue', new_project_issue_path(@project), title: 'New issue', id: 'new_issue_link'
 
     - if can_update_issue
       = link_to 'Edit', edit_project_issue_path(@project, @issue), class: 'hidden-xs hidden-sm btn btn-grouped issuable-edit'

app/views/projects/merge_requests/_mr_title.html.haml

@@ -24,15 +24,14 @@
         = icon('caret-down')
       .dropdown-menu.dropdown-menu-align-right.hidden-lg
         %ul
+          - if can_update_merge_request
+            %li= link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
+          %li= link_to 'Report abuse', new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request))
           - if can_update_merge_request
             %li{ class: merge_request_button_visibility(@merge_request, true) }
               = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
             %li{ class: merge_request_button_visibility(@merge_request, false) }
               = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
-            %li
-              = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: 'issuable-edit'
-          %li
-            = link_to 'Report abuse', new_abuse_report_path(user_id: @merge_request.author.id, ref_url: merge_request_url(@merge_request))
 
       - if can_update_merge_request
         = link_to 'Edit', edit_project_merge_request_path(@project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit"