Merge branch 'issuable-white-bg' into 'master'

app/assets/stylesheets/framework/blocks.scss

@@ -146,6 +146,10 @@
   border-bottom: 1px solid $border-color;
 
   &.oneline-block {
-    line-height: 42px;
+    line-height: 36px;
+  }
+
+  > .controls {
+    float: right;
   }
 }

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

@@ -35,7 +35,7 @@
           Edit
 
   .issue-details.issuable-details
-    .detail-page-description.gray-content-block.second-block
+    .detail-page-description.content-block
       %h2.title
         = markdown escape_once(@issue.title), pipeline: :single_line
       %div
@@ -50,7 +50,7 @@
         .merge-requests
           = render 'merge_requests'
 
-    .gray-content-block.second-block.oneline-block
+    .content-block
       = render 'votes/votes_block', votable: @issue
 
     .row

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

@@ -66,7 +66,7 @@
 
       .tab-content
         #notes.notes.tab-pane.voting_notes
-          .gray-content-block.second-block.oneline-block
+          .content-block.oneline-block
             = render 'votes/votes_block', votable: @merge_request
 
           .row

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

-.gray-content-block.middle-block.oneline-block
+.content-block.oneline-block
   = icon("sort-amount-desc")
   Most recent commits displayed first
 

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

-.detail-page-description.gray-content-block.second-block
+.detail-page-description.content-block
   %h2.title
     = markdown escape_once(@merge_request.title), pipeline: :single_line
 

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

@@ -32,7 +32,7 @@
         = icon('pencil-square-o')
         Edit
 
-.detail-page-description.gray-content-block.second-block
+.detail-page-description.content-block
   %h2.title
     = markdown escape_once(@milestone.title), pipeline: :single_line
   %div
@@ -73,8 +73,8 @@
 
 .tab-content
   .tab-pane.active#tab-issues
-    .gray-content-block.middle-block
-      .pull-right
+    .content-block.oneline-block
+      .controls
         - if can?(current_user, :create_issue, @project)
           = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { milestone_id: @milestone.id }), class: "btn  btn-grouped", title: "New Issue" do
             %i.fa.fa-plus
@@ -94,8 +94,8 @@
         = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
 
   .tab-pane#tab-merge-requests
-    .gray-content-block.middle-block
-      .pull-right
+    .content-block.oneline-block
+      .controls
         - if can?(current_user, :read_merge_request, @project)
           = link_to 'Browse Merge Requests', namespace_project_merge_requests_path(@milestone.project.namespace, @milestone.project, milestone_title: @milestone.title), class: "btn btn-grouped"
 
@@ -117,8 +117,7 @@
               = render 'merge_request', merge_request: merge_request
 
   .tab-pane#tab-participants
-    .gray-content-block.middle-block
-      .oneline
+    .content-block.oneline-block
       All participants to this milestone
 
     %ul.bordered-list