Fix spacing and alignment of MR discussion box; Move download and checkout buttons onto new line; wrap branch name normally25184-add-mr-description-to-discussion-tab

5 files changed, 22 insertions, 20 deletions

diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index c1985e750e0..6534bed54a0 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -19,7 +19,6 @@
 }
 
 .detail-page-description {
-  margin-top: 16px;
 
   .title {
     margin: 0 0 16px;
@@ -38,4 +37,8 @@
       }
     }
   }
+
+  &.mr-description {
+    margin-top: 16px;
+  }
 }
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2d4628eb19e..5eb4569d64a 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -246,6 +246,10 @@
   }
 }
 
+.mr-title {
+  margin: $gl-padding 0;
+}
+
 .label-branch {
   color: $gl-text-color;
   font-family: $monospace_font;
@@ -253,7 +257,6 @@
   overflow: hidden;
   font-size: 90%;
   margin: 0 3px;
-  word-break: break-all;
 }
 
 .commits-empty {
@@ -336,10 +339,6 @@
   }
 }
 
-.mr-source-target {
-  line-height: 31px;
-}
-
 .panel-new-merge-request {
   .panel-heading {
     padding: 5px 10px;
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index fd6b5dfe9c1..e57858e458f 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -9,16 +9,24 @@
   = render "projects/merge_requests/show/mr_title"
 
   .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
-    .append-bottom-default.mr-source-target.prepend-top-default
+    .append-bottom-default.mr-source-target
+      .append-bottom-10
+        %span Request to merge
+        %span.label-branch= source_branch_with_namespace(@merge_request)
+        %span into
+        %span.label-branch
+          = link_to_if @merge_request.target_branch_exists?, @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)
+        - if @merge_request.open? && @merge_request.diverged_from_target_branch?
+          %span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind)
+
       - if @merge_request.open?
-        .pull-right
+        .checkout-download-buttons
           - if @merge_request.source_branch_exists?
             - if koding_enabled? && @repository.koding_yml
               = link_to koding_project_url(@merge_request.source_project, @merge_request.source_branch, @merge_request.commits.first.short_id), class: "btn inline btn-grouped btn-sm", target: '_blank' do
                 Run in IDE (Koding)
-            = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do
+            = link_to "#modal_merge_info", class: "btn inline btn-sm", "data-toggle" => "modal" do
               Check out branch
-
           %span.dropdown.inline.prepend-left-5
             %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
               Download as
@@ -26,14 +34,6 @@
             %ul.dropdown-menu.dropdown-menu-align-right
               %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
               %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
-      .normal
-        %span Request to merge
-        %span.label-branch= source_branch_with_namespace(@merge_request)
-        %span into
-        %span.label-branch
-          = link_to_if @merge_request.target_branch_exists?, @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)
-        - if @merge_request.open? && @merge_request.diverged_from_target_branch?
-          %span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind)
 
     - if @merge_request.source_branch_exists?
       = render "projects/merge_requests/show/how_to_merge"
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 9ec85185365..d8ef1e90380 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,4 +1,4 @@
-.detail-page-description.info-well
+.detail-page-description.info-well.mr-description
   .well-segment
     %div
       - if @merge_request.description.present?
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 5ae2ce1eed7..196a3053dec 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -34,5 +34,5 @@
         = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit" do
           Edit
 
-%h2.title
+%h2.title.mr-title
   = markdown_field(@merge_request, :title)