Commit 65003b01 authored by Phil Hughes's avatar Phil Hughes

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

Fix layout of group milestone header

Closes #60750

See merge request gitlab-org/gitlab-ce!28487
parents 5396b2a8 d4d2e9de
...@@ -4,10 +4,7 @@ ...@@ -4,10 +4,7 @@
- group = local_assigns[:group] - group = local_assigns[:group]
- is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone? - is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone?
.detail-page-header .detail-page-header.milestone-page-header
%a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
= icon('angle-double-left')
.status-box{ class: "status-box-#{milestone.closed? ? 'closed' : 'open'}" } .status-box{ class: "status-box-#{milestone.closed? ? 'closed' : 'open'}" }
- if milestone.closed? - if milestone.closed?
Closed Closed
...@@ -15,14 +12,17 @@ ...@@ -15,14 +12,17 @@
Expired Expired
- else - else
Open Open
%span.identifier
Milestone #{milestone.title} .header-text-content
- if milestone.due_date || milestone.start_date %span.identifier
%span.creator Milestone #{milestone.title}
 · - if milestone.due_date || milestone.start_date
= milestone_date_range(milestone) %span.creator
- if group  ·
.float-right = milestone_date_range(milestone)
.milestone-buttons
- if group
- if can?(current_user, :admin_milestone, group) - if can?(current_user, :admin_milestone, group)
- if milestone.group_milestone? - if milestone.group_milestone?
= link_to edit_group_milestone_path(group, milestone), class: "btn btn btn-grouped" do = link_to edit_group_milestone_path(group, milestone), class: "btn btn btn-grouped" do
...@@ -35,6 +35,9 @@ ...@@ -35,6 +35,9 @@
- unless is_dynamic_milestone - unless is_dynamic_milestone
= render 'shared/milestones/delete_button' = 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 = render 'shared/milestones/deprecation_message' if is_dynamic_milestone
.detail-page-description.milestone-detail .detail-page-description.milestone-detail
......
---
title: Fix layout of group milestone header
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment