diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-21 07:32:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-21 07:32:31 +0000 |
| commit | 65003b01c84a9561d3febab01f6cb0f9a5dd6788 (patch) | |
| tree | 358857fd2a6aefc4293afe0d81c5939c49df5e98 /app | |
| parent | 5396b2a81aba6ed2bf85906a3256e171337b6df0 (diff) | |
| parent | d4d2e9de34c25c59643c0a39e41bf5e4774db8f8 (diff) | |
| download | gitlab-ce-65003b01c84a9561d3febab01f6cb0f9a5dd6788.tar.gz | |
Merge branch '60750-milestone-header' into 'master'
Fix layout of group milestone header
Closes #60750
See merge request gitlab-org/gitlab-ce!28487
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/milestones/_top.html.haml | 27 |
1 files changed, 15 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 |