Update merge request presentation

riyad · Aug 9, 2012 · f2fffcb · f2fffcb
1 parent ea34f43
commit f2fffcb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
@@ -31,9 +31,13 @@
 }
 
 /**
- * MR -> show: Automerge widget
+ * MR -> show
  *
  */
+.main_box .merge-branches {
+  line-height: 36px;
+  margin: 15px;
+}
 .automerge_widget { 
   &.can_be_merged { 
     background: #DFF0D8;
@@ -98,4 +102,11 @@ li.merge_request {
     padding: 0px;
     padding-bottom: 2px;
   }
+  .notes-count {
+    margin-top: 4px;
+  }
+  .merge-branches {
+    display: inline-block;
+    line-height: 36px;
+  }
 }
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
@@ -7,13 +7,13 @@
             %i.icon-ok
             = "MERGED"
       - if merge_request.notes.any?
-        %span.btn.small.disabled.grouped
+        .notes-count.btn.small.disabled.grouped
           %i.icon-comment
           = merge_request.notes.count
-      %span.btn.small.disabled.grouped
-        = merge_request.source_branch
+      .merge-branches
+        %span.pretty_label.branch= merge_request.source_branch
         &rarr;
-        = merge_request.target_branch
+        %span.pretty_label.branch= merge_request.target_branch
   %strong.gfm-id !#{merge_request.id}
 
   %p= link_to_gfm truncate(merge_request.title, :length => 80), project_merge_request_path(merge_request.project, merge_request), :class => "row_title"

diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml
@@ -1,4 +1,8 @@
 .main_box
+  .merge-branches.right
+    %span.pretty_label.branch= @merge_request.source_branch
+    &rarr;
+    %span.pretty_label.branch= @merge_request.target_branch
   .top_box_content
     %h4
       - if @merge_request.closed

diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml
@@ -1,10 +1,6 @@
 %h3.page_title
   Merge Request
   %strong.gfm-id !#{@merge_request.id}
-  &nbsp;
-  %span.pretty_label.branch= @merge_request.source_branch
-  &rarr;
-  %span.pretty_label.branch= @merge_request.target_branch
 
   %span.right
     - if @merge_request.merged?