From 42785686f98b7bcb9576bd7c4be5db0b244f91cf Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Fri, 15 Jun 2018 15:39:50 +0100 Subject: Updated the design of milestone list status --- app/views/shared/_milestone_expired.html.haml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 5e9007aaaac..814eda5e540 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,7 +1,9 @@ -- if milestone.expired? and not milestone.closed? - %span.cred (Expired) -- if milestone.upcoming? - %span.clgray (Upcoming) - if milestone.due_date || milestone.start_date - %span + %div = milestone_date_range(milestone) +- if milestone.expired? and not milestone.closed? + .status-box.status-box-expired Expired +- if milestone.upcoming? + .status-box.status-box-mr-merged Upcoming +- if milestone.closed? + .status-box.status-box-closed Closed -- cgit v1.2.3 From 518eefcb9a59c1d89971e592f7d76855cbf0e8be Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 15:12:44 +0100 Subject: Updated placement of milestone actions in milestone list --- app/views/shared/milestones/_milestone.html.haml | 71 ++++++++++++------------ 1 file changed, 36 insertions(+), 35 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 09bbd04c2bf..00893c65638 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -10,14 +10,45 @@ - else %span - Project Milestone - .col-sm-6 - .float-right.light #{milestone.percent_complete(current_user)}% complete - .row - .col-sm-6 + .col-sm-4 + = milestone_progress_bar(milestone) = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path · = link_to pluralize(milestone.merge_requests.size, 'Merge Request'), merge_requests_path - .col-sm-6= milestone_progress_bar(milestone) + .float-right.light #{milestone.percent_complete(current_user)}% complete + .col-sm-2 + - if @project + .col-sm-6.milestone-actions + - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? + = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-sm btn-grouped" do + Edit + \ + + - if @project.group + %button.js-promote-project-milestone-button.btn.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), + disabled: true, + type: 'button', + data: { url: promote_project_milestone_path(milestone.project, milestone), + milestone_title: milestone.title, + group_name: @project.group.name, + target: '#promote-milestone-modal', + container: 'body', + toggle: 'modal' } } + = _('Promote') + + = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" + + %button.js-delete-milestone-button.btn.btn-sm.btn-grouped.btn-danger{ data: { toggle: 'modal', + target: '#delete-milestone-modal', + milestone_id: milestone.id, + milestone_title: markdown_field(milestone, :title), + milestone_url: project_milestone_path(milestone.project, milestone), + milestone_issue_count: milestone.issues.count, + milestone_merge_request_count: milestone.merge_requests.count }, + disabled: true } + = _('Delete') + = icon('spin spinner', class: 'js-loading-icon hidden' ) + - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? .row .col-sm-6 @@ -44,33 +75,3 @@ .row .col-sm-6 = render('shared/milestone_expired', milestone: milestone) - .col-sm-6.milestone-actions - - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-sm btn-grouped" do - Edit - \ - - - if @project.group - %button.js-promote-project-milestone-button.btn.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), - disabled: true, - type: 'button', - data: { url: promote_project_milestone_path(milestone.project, milestone), - milestone_title: milestone.title, - group_name: @project.group.name, - target: '#promote-milestone-modal', - container: 'body', - toggle: 'modal' } } - = _('Promote') - - = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" - - %button.js-delete-milestone-button.btn.btn-sm.btn-grouped.btn-danger{ data: { toggle: 'modal', - target: '#delete-milestone-modal', - milestone_id: milestone.id, - milestone_title: markdown_field(milestone, :title), - milestone_url: project_milestone_path(milestone.project, milestone), - milestone_issue_count: milestone.issues.count, - milestone_merge_request_count: milestone.merge_requests.count }, - disabled: true } - = _('Delete') - = icon('spin spinner', class: 'js-loading-icon hidden' ) -- cgit v1.2.3 From 2659dcb6b4df3d3c5697fc9692732fc2ed367e20 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 15:34:40 +0100 Subject: Removed edit and delete buttons from milestone list --- app/views/shared/milestones/_milestone.html.haml | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 00893c65638..7dfce0cd812 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -20,10 +20,6 @@ - if @project .col-sm-6.milestone-actions - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-sm btn-grouped" do - Edit - \ - - if @project.group %button.js-promote-project-milestone-button.btn.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), disabled: true, @@ -38,17 +34,6 @@ = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" - %button.js-delete-milestone-button.btn.btn-sm.btn-grouped.btn-danger{ data: { toggle: 'modal', - target: '#delete-milestone-modal', - milestone_id: milestone.id, - milestone_title: markdown_field(milestone, :title), - milestone_url: project_milestone_path(milestone.project, milestone), - milestone_issue_count: milestone.issues.count, - milestone_merge_request_count: milestone.merge_requests.count }, - disabled: true } - = _('Delete') - = icon('spin spinner', class: 'js-loading-icon hidden' ) - - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? .row .col-sm-6 -- cgit v1.2.3 From 7e35188e0825c8d96ee2b043958f656654e51a63 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 16:32:02 +0100 Subject: Updated styling of promote project milestone button in the milestones list --- app/views/shared/milestones/_milestone.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 7dfce0cd812..baa2100da95 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -18,10 +18,10 @@ .float-right.light #{milestone.percent_complete(current_user)}% complete .col-sm-2 - if @project - .col-sm-6.milestone-actions + .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - if @project.group - %button.js-promote-project-milestone-button.btn.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), + %button.js-promote-project-milestone-button.btn.btn-transparent.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), disabled: true, type: 'button', data: { url: promote_project_milestone_path(milestone.project, milestone), @@ -30,7 +30,7 @@ target: '#promote-milestone-modal', container: 'body', toggle: 'modal' } } - = _('Promote') + = sprite_icon('level-up', size: 12) = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" -- cgit v1.2.3 From 2a638c4231fdbaab77240999be98dd6cde385b76 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 16:55:27 +0100 Subject: Added 'Reopen Milestone' button to milestones list for closed milestones --- app/views/shared/milestones/_milestone.html.haml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index baa2100da95..4ac69d21174 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -33,6 +33,8 @@ = sprite_icon('level-up', size: 12) = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" + - unless milestone.active? + = link_to 'Reopen Milestone', project_milestone_path(@project, milestone, {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen" - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? .row -- cgit v1.2.3 From d2daa6183251a1ce0397f4a50395dd171ec2a7eb Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 17:14:10 +0100 Subject: Update milestone actions placement for group milestones in milestones list --- app/views/shared/milestones/_milestone.html.haml | 36 ++++++++++-------------- 1 file changed, 15 insertions(+), 21 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 4ac69d21174..d263b4288c5 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -10,6 +10,15 @@ - else %span - Project Milestone + - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? + = render('shared/milestone_expired', milestone: milestone) + - if milestone.legacy_group_milestone? + .projects + - milestone.milestones.each do |milestone| + = link_to milestone_path(milestone) do + %span.badge.badge-gray + = dashboard ? milestone.project.full_name : milestone.project.name + .col-sm-4 = milestone_progress_bar(milestone) = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path @@ -17,8 +26,8 @@ = link_to pluralize(milestone.merge_requests.size, 'Merge Request'), merge_requests_path .float-right.light #{milestone.percent_complete(current_user)}% complete .col-sm-2 - - if @project - .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end + .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end + - if @project - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - if @project.group %button.js-promote-project-milestone-button.btn.btn-transparent.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), @@ -35,30 +44,15 @@ = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" - unless milestone.active? = link_to 'Reopen Milestone', project_milestone_path(@project, milestone, {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen" - - - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? - .row - .col-sm-6 - - if milestone.legacy_group_milestone? - .expiration= render('shared/milestone_expired', milestone: milestone) - .projects - - milestone.milestones.each do |milestone| - = link_to milestone_path(milestone) do - %span.badge.badge-gray - = dashboard ? milestone.project.full_name : milestone.project.name - - if @group - .col-sm-6.milestone-actions + - if @group - if can?(current_user, :admin_milestones, @group) - - if milestone.group_milestone? - = link_to edit_group_milestone_path(@group, milestone), class: "btn btn-sm btn-grouped" do - Edit - \ - if milestone.closed? = link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen" - else = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" - - if @project + - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? .row .col-sm-6 - = render('shared/milestone_expired', milestone: milestone) + + -- cgit v1.2.3 From 8b2a6d41d5359dbfdd5a159f0cce602f36785e1e Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 18 Jun 2018 17:34:59 +0100 Subject: updated placement of milestone type for dashboard milestone list --- app/views/shared/milestones/_milestone.html.haml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index d263b4288c5..725698226ac 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -1,14 +1,13 @@ - dashboard = local_assigns[:dashboard] - custom_dom_id = dom_id(milestone.try(:milestones) ? milestone.milestones.first : milestone) +- milestone_type = milestone.group_milestone? ? 'Group Milestone' : 'Project Milestone' %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row .col-sm-6 %strong= link_to truncate(milestone.title, length: 100), milestone_path - - if milestone.group_milestone? - %span - Group Milestone - - else - %span - Project Milestone + - unless dashboard + = milestone_type - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? = render('shared/milestone_expired', milestone: milestone) @@ -50,9 +49,10 @@ = link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen" - else = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" + - if dashboard + .status-box.status-box-upcoming + = milestone_type + - - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? - .row - .col-sm-6 -- cgit v1.2.3 From 44c82ebbd13a92019297693cc224447653f0ecc2 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 19 Jun 2018 11:43:47 +0100 Subject: Added styles for milestone date range in milestone list --- app/views/shared/_milestone_expired.html.haml | 2 +- app/views/shared/milestones/_milestone.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 814eda5e540..738622a4993 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,5 +1,5 @@ - if milestone.due_date || milestone.start_date - %div + .milestone-range = milestone_date_range(milestone) - if milestone.expired? and not milestone.closed? .status-box.status-box-expired Expired diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 725698226ac..4df87471947 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -29,7 +29,7 @@ - if @project - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? - if @project.group - %button.js-promote-project-milestone-button.btn.btn-transparent.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), + %button.js-promote-project-milestone-button.btn.btn-blank.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), disabled: true, type: 'button', data: { url: promote_project_milestone_path(milestone.project, milestone), @@ -38,7 +38,7 @@ target: '#promote-milestone-modal', container: 'body', toggle: 'modal' } } - = sprite_icon('level-up', size: 12) + = sprite_icon('level-up', size: 14) = link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" - unless milestone.active? -- cgit v1.2.3 From 8c0c4750dbe79ac1515ee62485aaafd4883cc7cc Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 19 Jun 2018 12:09:33 +0100 Subject: Added styling for milestone progress --- app/views/shared/milestones/_milestone.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 4df87471947..17bb3872066 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -7,7 +7,7 @@ .col-sm-6 %strong= link_to truncate(milestone.title, length: 100), milestone_path - unless dashboard - = milestone_type + = " - #{milestone_type}" - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? = render('shared/milestone_expired', milestone: milestone) @@ -18,7 +18,7 @@ %span.badge.badge-gray = dashboard ? milestone.project.full_name : milestone.project.name - .col-sm-4 + .col-sm-4.milestone-progress = milestone_progress_bar(milestone) = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path · -- cgit v1.2.3 From aad99b513ba699352f24db289a184bac70b6780a Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 19 Jun 2018 12:36:47 +0100 Subject: Updated styling of milestone type in dashboard milestones list --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 17bb3872066..14b743f4823 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -50,7 +50,7 @@ - else = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" - if dashboard - .status-box.status-box-upcoming + .status-box.status-box-milestone = milestone_type -- cgit v1.2.3 From 0e06315af6e515281e01ef8d349c37b8ed1a364d Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 19 Jun 2018 12:42:39 +0100 Subject: Fixed mobile placement for milestone percent complete in milestones list --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 14b743f4823..1f3eff6b9e1 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -23,7 +23,7 @@ = link_to pluralize(milestone.total_issues_count(current_user), 'Issue'), issues_path · = link_to pluralize(milestone.merge_requests.size, 'Merge Request'), merge_requests_path - .float-right.light #{milestone.percent_complete(current_user)}% complete + .float-lg-right.light #{milestone.percent_complete(current_user)}% complete .col-sm-2 .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end - if @project -- cgit v1.2.3 From eec5324aaefaddc55287c3345449289a90845606 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Tue, 19 Jun 2018 12:50:23 +0100 Subject: Fixed lint errors --- app/views/shared/milestones/_milestone.html.haml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 1f3eff6b9e1..e0d9bb91b46 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -50,9 +50,5 @@ - else = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" - if dashboard - .status-box.status-box-milestone + .status-box.status-box-milestone = milestone_type - - - - -- cgit v1.2.3 From 90a10c32eccf07011784bee5ad4cb0270f04a7dd Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Wed, 20 Jun 2018 23:22:44 +0100 Subject: Updated markup for milestone title in milestones list --- app/views/shared/milestones/_milestone.html.haml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index e0d9bb91b46..75f5cef2d6d 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -5,9 +5,10 @@ %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row .col-sm-6 - %strong= link_to truncate(milestone.title, length: 100), milestone_path - - unless dashboard - = " - #{milestone_type}" + %div + %strong= link_to truncate(milestone.title, length: 100), milestone_path + - unless dashboard + = " - #{milestone_type}" - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? = render('shared/milestone_expired', milestone: milestone) -- cgit v1.2.3 From 55df4770a99d0d8c55242bd5a76ded8c3df04a13 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Wed, 20 Jun 2018 23:38:54 +0100 Subject: Removed milestone type from project milestones --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 75f5cef2d6d..0ed52404cd8 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -7,7 +7,7 @@ .col-sm-6 %div %strong= link_to truncate(milestone.title, length: 100), milestone_path - - unless dashboard + - if @group = " - #{milestone_type}" - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? -- cgit v1.2.3 From e25c8a1b2b30e4187dad379c99ba6995f2ef985a Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 21 Jun 2018 13:21:31 +0100 Subject: Updated the styling of milestone projects in groups milestone list --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 0ed52404cd8..92fe76b8646 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -16,7 +16,7 @@ .projects - milestone.milestones.each do |milestone| = link_to milestone_path(milestone) do - %span.badge.badge-gray + %span.label-badge.label-badge-blue = dashboard ? milestone.project.full_name : milestone.project.name .col-sm-4.milestone-progress -- cgit v1.2.3 From 8951b865f646cea1fb33d76940a29cc6b85eba8d Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 21 Jun 2018 13:33:40 +0100 Subject: Added changelog entry --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 92fe76b8646..4661126c904 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -16,7 +16,7 @@ .projects - milestone.milestones.each do |milestone| = link_to milestone_path(milestone) do - %span.label-badge.label-badge-blue + %span.label-badge.label-badge-blue = dashboard ? milestone.project.full_name : milestone.project.name .col-sm-4.milestone-progress -- cgit v1.2.3 From 3219b202222e91f129d69ec9b71f6e5ecc3dc0e4 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 25 Jun 2018 12:48:48 +0100 Subject: Updated stlying of title and date range of milestone list --- app/views/shared/_milestone_expired.html.haml | 2 +- app/views/shared/milestones/_milestone.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index 738622a4993..e58f346b5b5 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,5 +1,5 @@ - if milestone.due_date || milestone.start_date - .milestone-range + .milestone-range.append-bottom-5 = milestone_date_range(milestone) - if milestone.expired? and not milestone.closed? .status-box.status-box-expired Expired diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 4661126c904..297b88d2342 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -5,7 +5,7 @@ %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row .col-sm-6 - %div + .append-bottom-5 %strong= link_to truncate(milestone.title, length: 100), milestone_path - if @group = " - #{milestone_type}" -- cgit v1.2.3 From a87a5836c3e6acd0f5cccf631c12e240c0dfaaa5 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Mon, 25 Jun 2018 14:31:19 +0100 Subject: Fixed alignment of milestone status and projects in milestone list --- app/views/shared/_milestone_expired.html.haml | 3 --- app/views/shared/milestones/_milestone.html.haml | 18 +++++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index e58f346b5b5..f49017c59b2 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,6 +1,3 @@ -- if milestone.due_date || milestone.start_date - .milestone-range.append-bottom-5 - = milestone_date_range(milestone) - if milestone.expired? and not milestone.closed? .status-box.status-box-expired Expired - if milestone.upcoming? diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 297b88d2342..d1b87b616ed 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -11,13 +11,17 @@ = " - #{milestone_type}" - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? - = render('shared/milestone_expired', milestone: milestone) - - if milestone.legacy_group_milestone? - .projects - - milestone.milestones.each do |milestone| - = link_to milestone_path(milestone) do - %span.label-badge.label-badge-blue - = dashboard ? milestone.project.full_name : milestone.project.name + - if milestone.due_date || milestone.start_date + .milestone-range.append-bottom-5 + = milestone_date_range(milestone) + %div + = render('shared/milestone_expired', milestone: milestone) + - if milestone.legacy_group_milestone? + .projects + - milestone.milestones.each do |milestone| + = link_to milestone_path(milestone) do + %span.label-badge.label-badge-blue.d-inline-block.append-bottom-5.append-right-5 + = dashboard ? milestone.project.full_name : milestone.project.name .col-sm-4.milestone-progress = milestone_progress_bar(milestone) -- cgit v1.2.3 From 743d0d5eda5137a1861f1b6cc86a42fac6e49af0 Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Thu, 28 Jun 2018 22:18:55 +0100 Subject: Adjusted styling of milestone projects in milestone list --- app/views/shared/milestones/_milestone.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/shared') diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index d1b87b616ed..c559945a9c9 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -20,7 +20,7 @@ .projects - milestone.milestones.each do |milestone| = link_to milestone_path(milestone) do - %span.label-badge.label-badge-blue.d-inline-block.append-bottom-5.append-right-5 + %span.label-badge.label-badge-blue.d-inline-block.append-bottom-5 = dashboard ? milestone.project.full_name : milestone.project.name .col-sm-4.milestone-progress -- cgit v1.2.3 From fbcb55c6a8e2944411a3244bd7b09b3b9d1fe1df Mon Sep 17 00:00:00 2001 From: Constance Okoghenun Date: Fri, 29 Jun 2018 13:42:35 +0100 Subject: Adujsted the height of milestone status on milestones list on mobile --- app/views/shared/_milestone_expired.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml index f49017c59b2..099e3ac8462 100644 --- a/app/views/shared/_milestone_expired.html.haml +++ b/app/views/shared/_milestone_expired.html.haml @@ -1,6 +1,6 @@ - if milestone.expired? and not milestone.closed? - .status-box.status-box-expired Expired + .status-box.status-box-expired.append-bottom-5 Expired - if milestone.upcoming? - .status-box.status-box-mr-merged Upcoming + .status-box.status-box-mr-merged.append-bottom-5 Upcoming - if milestone.closed? - .status-box.status-box-closed Closed + .status-box.status-box-closed.append-bottom-5 Closed -- cgit v1.2.3