Fix layout of group milestone header
This commit is contained in:
parent
7115bd811f
commit
d4d2e9de34
2 changed files with 20 additions and 12 deletions
|
@ -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 @@
|
||||||
Expired
|
Expired
|
||||||
- else
|
- else
|
||||||
Open
|
Open
|
||||||
|
|
||||||
|
.header-text-content
|
||||||
%span.identifier
|
%span.identifier
|
||||||
Milestone #{milestone.title}
|
Milestone #{milestone.title}
|
||||||
- if milestone.due_date || milestone.start_date
|
- if milestone.due_date || milestone.start_date
|
||||||
%span.creator
|
%span.creator
|
||||||
·
|
·
|
||||||
= milestone_date_range(milestone)
|
= milestone_date_range(milestone)
|
||||||
|
|
||||||
|
.milestone-buttons
|
||||||
- if group
|
- if group
|
||||||
.float-right
|
|
||||||
- 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 @@
|
||||||
- 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
|
||||||
|
|
5
changelogs/unreleased/60750-milestone-header.yml
Normal file
5
changelogs/unreleased/60750-milestone-header.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fix layout of group milestone header
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
Loading…
Reference in a new issue