Commit 79abeb8c authored by Mark Florian's avatar Mark Florian

Merge branch '225393-Close-Milestone-Button-is-Incorect-Size' into 'master'

Milestone Dashboard: Move Gray Type Badge Next to the Milestone Title

See merge request gitlab-org/gitlab!39617
parents defb965d 22dae4a9
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.gl-mb-2 .gl-mb-2
%strong{ data: { qa_selector: "milestone_link", qa_milestone_title: milestone.title } } %strong{ data: { qa_selector: "milestone_link", qa_milestone_title: milestone.title } }
= link_to truncate(milestone.title, length: 100), milestone_path(milestone) = link_to truncate(milestone.title, length: 100), milestone_path(milestone)
- if @group - if @group || dashboard
= " - #{milestone_type}" = " - #{milestone_type}"
- if milestone.due_date || milestone.start_date - if milestone.due_date || milestone.start_date
...@@ -62,7 +62,3 @@ ...@@ -62,7 +62,3 @@
= link_to s_('Milestones|Reopen Milestone'), milestone_path(milestone, milestone: { state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen" = link_to s_('Milestones|Reopen Milestone'), milestone_path(milestone, milestone: { state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
- else - else
= link_to s_('Milestones|Close Milestone'), milestone_path(milestone, milestone: { state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" = link_to s_('Milestones|Close Milestone'), milestone_path(milestone, milestone: { state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close"
- if dashboard
.label-badge.label-badge-gray
= milestone_type
---
title: 'Milestone Dashboard: Move Gray Type Badge Next to the Milestone Title'
merge_request: 39617
author: Kev @KevSlashNull
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