Merge branch '60750-milestone-header' into 'master'

Fix layout of group milestone header Closes #60750 See merge request gitlab-org/gitlab-ce!28487

Merge branch '60750-milestone-header' into 'master'
Fix layout of group milestone header Closes #60750 See merge request gitlab-org/gitlab-ce!28487
65003b01 · Phil Hughes · 5396b2a8 · d4d2e9de · 65003b01 · 65003b01
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -4,10 +4,7 @@
 - group = local_assigns[:group]
 - is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone?

-.detail-page-header
-  %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
-    = icon('angle-double-left')
-
+.detail-page-header.milestone-page-header
  .status-box{ class: "status-box-#{milestone.closed? ? 'closed' : 'open'}" }
    - if milestone.closed?
      Closed
@@ -15,14 +12,17 @@
      Expired
    - else
      Open
-  %span.identifier
-    Milestone #{milestone.title}
-  - if milestone.due_date || milestone.start_date
-    %span.creator
-      &nbsp;&middot;
-      = milestone_date_range(milestone)
-  - if group
-    .float-right
+
+  .header-text-content
+    %span.identifier
+      Milestone #{milestone.title}
+    - if milestone.due_date || milestone.start_date
+      %span.creator
+        &nbsp;&middot;
+        = milestone_date_range(milestone)
+
+  .milestone-buttons
+    - if group
      - if can?(current_user, :admin_milestone, group)
        - if milestone.group_milestone?
          = link_to edit_group_milestone_path(group, milestone), class: "btn btn btn-grouped" do
@@ -35,6 +35,9 @@
        - unless is_dynamic_milestone
          = render 'shared/milestones/delete_button'

+    %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
+      = icon('angle-double-left')
+
 = render 'shared/milestones/deprecation_message' if is_dynamic_milestone

 .detail-page-description.milestone-detail

--- a/changelogs/unreleased/60750-milestone-header.yml
+++ b/changelogs/unreleased/60750-milestone-header.yml
+---
+title: Fix layout of group milestone header
+merge_request:
+author:
+type: fixed