From d49b993929f21585ece74fbca3ed8ab8163f8737 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 6 May 2015 16:19:09 +0300
Subject: [PATCH] Small UI improvements to MR form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/projects/_aside.html.haml                      | 5 +++++
 app/views/projects/merge_requests/_new_compare.html.haml | 7 +++----
 app/views/projects/merge_requests/_new_submit.html.haml  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml
index 1a7ab74c93a..1e7d2adcb86 100644
--- a/app/views/projects/_aside.html.haml
+++ b/app/views/projects/_aside.html.haml
@@ -39,6 +39,11 @@
         = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm' do
           %i.fa.fa-fw.fa-exclamation-circle
           New issue
+        - if can? current_user, :write_merge_request, @project
+          &nbsp;
+          = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-sm", title: "New Merge Request" do
+            %i.fa.fa-plus
+            New Merge Request
 
 
 
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 17e76059fdb..e611b23bca6 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -1,5 +1,4 @@
-%h3.page-title Compare branches for new Merge Request
-%hr
+%p.lead Compare branches for new Merge Request
 
 = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: new_namespace_project_merge_request_path(@project.namespace, @project), method: :get, html: { class: "merge-request-form form-inline" } do |f|
   .hide.alert.alert-danger.mr-compare-errors
@@ -52,8 +51,8 @@
               are the same.
 
 
-  %hr
-  = f.submit 'Compare branches', class: "btn btn-primary mr-compare-btn"
+  %div
+    = f.submit 'Compare branches', class: "btn btn-new mr-compare-btn"
 
 :javascript
   var source_branch = $("#merge_request_source_branch")
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index c38da76ba27..24a9563dd4d 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -8,7 +8,7 @@
 
   %span.pull-right
     = link_to 'Change branches', mr_change_branches_path(@merge_request)
-
+%hr
 = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form' } do |f|
   .merge-request-form-info
     = render 'projects/issuable_form', f: f, issuable: @merge_request
-- 
GitLab