Style merge request page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/stylesheets/pages/merge_requests.scss

@@ -3,10 +3,10 @@
  *
  */
 .mr-state-widget {
-  background: #FAFAFA;
+  background: #f8fafc;
   margin-bottom: 20px;
-  color: #666;
-  border: 1px solid #e5e5e5;
+  color: $gl-gray;
+  border: 1px solid #eef0f2;
   @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
   @include border-radius(3px);
 
@@ -29,6 +29,14 @@
       padding: 5px;
       line-height: 20px;
 
+      &.right {
+        float: right;
+        padding-top: 12px;
+        a {
+          color: $gl-gray;
+        }
+      }
+
       .remove_source_checkbox {
         margin: 0;
       }
@@ -36,7 +44,7 @@
   }
 
   .ci_widget {
-    border-bottom: 1px solid #EEE;
+    border-bottom: 1px solid #eef0f2;
 
     i {
       margin-right: 4px;
@@ -91,9 +99,12 @@
 
 .merge-request .merge-request-tabs{
   @include nav-menu;
-  margin-bottom: -15px;
-  margin-top: 26px;
-  text-align: left;
+  margin: -$gl-padding;
+  padding: $gl-padding;
+  text-align: center;
+  border-top: 1px solid #e7e9ed;
+  margin-top: 18px;
+  margin-bottom: 3px;
 }
 
 .mr_source_commit,

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

@@ -40,17 +40,14 @@
     %ul.merge-request-tabs
       %li.notes-tab
         = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#notes', action: 'notes', toggle: 'tab'} do
-          = icon('comments')
           Discussion
           %span.badge= @merge_request.mr_and_commit_notes.user.count
       %li.commits-tab
         = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#commits', action: 'commits', toggle: 'tab'} do
-          = icon('history')
           Commits
           %span.badge= @commits.size
       %li.diffs-tab
         = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#diffs', action: 'diffs', toggle: 'tab'} do
-          = icon('list-alt')
           Changes
           %span.badge= @merge_request.diffs.size
 

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

@@ -9,7 +9,7 @@
         = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
           = check_box_tag :should_remove_source_branch
           Remove source branch
-    .accept-control
+    .accept-control.right
       = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
         = icon('edit')
         Modify commit message