diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-05-20 10:50:05 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-05-20 11:09:51 -0500 |
| commit | d4d2e9de34c25c59643c0a39e41bf5e4774db8f8 (patch) | |
| tree | cce8dda96f0d753cc0e1dedea59c2880a7187fb2 | |
| parent | 7115bd811f4bc87c0706fc2b876729878ad8fc5b (diff) | |
| download | gitlab-ce-60750-milestone-header.tar.gz | |
Fix layout of group milestone header60750-milestone-header
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 27 | ||||
| -rw-r--r-- | changelogs/unreleased/60750-milestone-header.yml | 5 |
2 files changed, 20 insertions, 12 deletions
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml index edaeff782de..43503e1d08a 100644 --- 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 - · - = 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 + · + = 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 diff --git a/changelogs/unreleased/60750-milestone-header.yml b/changelogs/unreleased/60750-milestone-header.yml new file mode 100644 index 00000000000..62cfdaf6ea7 --- /dev/null +++ b/changelogs/unreleased/60750-milestone-header.yml @@ -0,0 +1,5 @@ +--- +title: Fix layout of group milestone header +merge_request: +author: +type: fixed |