Fix headers of milestone and snippet show pages

4 files changed, 16 insertions, 12 deletions

diff --git a/app/views/dashboard/milestones/show.html.haml b/app/views/dashboard/milestones/show.html.haml
index 44b7efe5232..12f5d46289b 100644
--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
@@ -2,15 +2,16 @@
 - header_title "Milestones", dashboard_milestones_path
 
 .issuable-details
-  .page-title
+  .issuable-title
     .issue-box{ class: "issue-box-#{@milestone.closed? ? 'closed' : 'open'}" }
       - if @milestone.closed?
         Closed
       - else
         Open
-    Milestone #{@milestone.title}
+    %span.issuable-id
+      Milestone #{@milestone.title}
 
-  .gray-content-block.middle-block
+  .gray-content-block.second-block
     %h2.issue-title
       = markdown escape_once(@milestone.title), pipeline: :single_line
 
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 350e216fcc6..b0defdbb88b 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -2,13 +2,14 @@
 = render "header_title"
 
 .issuable-details
-  .page-title
+  .issuable-title
     .issue-box{ class: "issue-box-#{@milestone.closed? ? 'closed' : 'open'}" }
       - if @milestone.closed?
         Closed
       - else
         Open
-    Milestone #{@milestone.title}
+    %span.issuable-id
+      Milestone #{@milestone.title}
     .pull-right
       - if can?(current_user, :admin_milestones, @group)
         - if @milestone.active?
@@ -16,7 +17,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(@group, @milestone.safe_title, title: @milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-  .gray-content-block.middle-block
+  .gray-content-block.second-block
     %h2.issue-title
       = markdown escape_once(@milestone.title), pipeline: :single_line
 
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 7ecee440337..97e1085cabf 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 
 .issuable-details
-  .page-title
+  .issuable-title
     .issue-box{ class: issue_box_class(@milestone) }
       - if @milestone.closed?
         Closed
@@ -10,7 +10,8 @@
         Expired
       - else
         Open
-    Milestone ##{@milestone.iid}
+    %span.issuable-id
+      Milestone ##{@milestone.iid}
     - if @milestone.expires_at
       %span.creator
         ·
@@ -30,7 +31,7 @@
           %i.fa.fa-trash-o
           Delete
 
-  .gray-content-block.middle-block
+  .gray-content-block.second-block
     %h2.issue-title
       = markdown escape_once(@milestone.title), pipeline: :single_line
     %div
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 669e6119fb6..04a2f5a2b3b 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -1,9 +1,10 @@
 .issuable-details
-  .page-title
+  .issuable-title
     .snippet-box.has_tooltip{class: visibility_level_color(@snippet.visibility_level), title: snippet_visibility_level_description(@snippet.visibility_level, @snippet), data: { container: 'body' }}
       = visibility_level_icon(@snippet.visibility_level, fw: false)
       = visibility_level_label(@snippet.visibility_level)
-    Snippet ##{@snippet.id}
+    %span.issuable-id
+      Snippet ##{@snippet.id}
     %span.creator
       · created by #{link_to_member(@project, @snippet.author, size: 24)}
       ·
@@ -20,6 +21,6 @@
       - else
         = render "snippets/actions"
 
-  .gray-content-block.middle-block
+  .gray-content-block.second-block
     %h2.issue-title
       = markdown escape_once(@snippet.title), pipeline: :single_line