Small restyle of issue and merge request pages

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

app/assets/stylesheets/base/gl_variables.scss

@@ -22,6 +22,10 @@ $brand-info:     $gl-info;
 $brand-warning:  $gl-warning;
 $brand-danger:   $gl-danger;
 
+$border-radius-base:        3px !default;
+$border-radius-large:       5px !default;
+$border-radius-small:       2px !default;
+
 
 //== Scaffolding
 //

app/assets/stylesheets/generic/blocks.scss

@@ -27,6 +27,11 @@
   border-bottom: 1px solid #e7e9ed;
   color: $gl-gray;
 
+  &.middle-block {
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
   &.second-block {
     margin-top: -1px;
     margin-bottom: 0;

app/assets/stylesheets/generic/issue_box.scss

@@ -5,10 +5,13 @@
  */
 
 .issue-box {
+  @include border-radius(3px);
+
   display: inline-block;
-  padding: 4px 13px;
+  padding: 10px $gl-padding;
   font-weight: normal;
-  margin-right: 5px;
+  margin-right: 10px;
+  font-size: $gl-font-size;
 
   &.issue-box-closed {
     background-color: $gl-danger;
@@ -21,7 +24,7 @@
   }
 
   &.issue-box-open {
-    background-color: $gl-success;
+    background-color: #019875;
     color: #FFF;
   }
 

app/assets/stylesheets/pages/issuable.scss

@@ -56,3 +56,22 @@
     text-align: left;
   }
 }
+
+.issuable-details {
+  .page-title {
+    margin-top: -15px;
+    padding: 10px 0;
+    margin-bottom: 0;
+    color: $gl-gray;
+    font-size: 16px;
+
+    .author {
+      color: $gl-gray;
+    }
+
+    .issue-id {
+      font-size: 19px;
+      color: $gl-text-color;
+    }
+  }
+}

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

 - page_title "#{@issue.title} (##{@issue.iid})", "Issues"
 .issue
   .issue-details.issuable-details
-    %h4.page-title
+    .page-title
       .issue-box{ class: issue_box_class(@issue) }
         - if @issue.closed?
           Closed
         - else
           Open
-      Issue ##{@issue.iid}
-      %small.creator
-        · created by #{link_to_member(@project, @issue.author)}
+      %span.issue-id Issue ##{@issue.iid}
+      %span.creator
+        · created by #{link_to_member(@project, @issue.author, size: 24)}
+        ·
         = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago')
         - if @issue.updated_at != @issue.created_at
           %span
@@ -32,18 +33,17 @@
             = icon('pencil-square-o')
             Edit
 
-    %hr
-    %h2.issue-title
-      = gfm escape_once(@issue.title)
-    %div
-      - if @issue.description.present?
-        .description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
-          .wiki
-            = preserve do
-              = markdown(@issue.description)
-          %textarea.hidden.js-task-list-field
-            = @issue.description
+    .gray-content-block.middle-block
+      %h2.issue-title
+        = gfm escape_once(@issue.title)
+      %div
+        - if @issue.description.present?
+          .description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
+            .wiki
+              = preserve do
+                = markdown(@issue.description)
+            %textarea.hidden.js-task-list-field
+              = @issue.description
 
-    %hr
-  .issue-discussion
+  .issue-discussion.prepend-top-default
     = render 'projects/issues/discussion'

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

@@ -5,10 +5,8 @@
 .merge-request{'data-url' => merge_request_path(@merge_request)}
   .merge-request-details.issuable-details
     = render "projects/merge_requests/show/mr_title"
-    %hr
     = render "projects/merge_requests/show/mr_box"
-    %hr
-    .append-bottom-20.mr-source-target
+    .append-bottom-20.mr-source-target.prepend-top-default
       - if @merge_request.open?
         .pull-right
           - if @merge_request.source_branch_exists?

app/views/projects/merge_requests/show/_mr_box.html.haml

-%h2.issue-title
-  = gfm escape_once(@merge_request.title)
+.gray-content-block.middle-block
+  %h2.issue-title
+    = gfm escape_once(@merge_request.title)
 
-%div
-  - if @merge_request.description.present?
-    .description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
-      .wiki
-        = preserve do
-          = markdown(@merge_request.description)
-      %textarea.hidden.js-task-list-field
-        = @merge_request.description
+  %div
+    - if @merge_request.description.present?
+      .description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
+        .wiki
+          = preserve do
+            = markdown(@merge_request.description)
+        %textarea.hidden.js-task-list-field
+          = @merge_request.description

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

-%h4.page-title
+.page-title
   .issue-box{ class: issue_box_class(@merge_request) }
     = @merge_request.state_human_name
-  Merge Request ##{@merge_request.iid}
-  %small.creator
+  %span.issue-id Merge Request ##{@merge_request.iid}
+  %span.creator
+    ·
+    created by #{link_to_member(@project, @merge_request.author, size: 24)}
     ·
-    created by #{link_to_member(@project, @merge_request.author)}
     = time_ago_with_tooltip(@merge_request.created_at)
     - if @merge_request.updated_at != @merge_request.created_at
       %span