Added colored labels to related MR list.
This commit is contained in:
parent
891465ba8c
commit
39754c6c05
|
@ -55,9 +55,27 @@ ul.related-merge-requests > li {
|
|||
}
|
||||
|
||||
.merge-request-status {
|
||||
color: $gl-gray;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
font-size: 13px;
|
||||
padding: 0px 5px;
|
||||
color: #FFF;
|
||||
height: 20px;
|
||||
border-radius: 3px;
|
||||
line-height: 18px;
|
||||
|
||||
&.merged {
|
||||
border: 1px solid #2A96CC;
|
||||
background: #2D9FD8;
|
||||
}
|
||||
|
||||
&.closed {
|
||||
border: 1px solid #C5254D;
|
||||
background: #D62954;
|
||||
}
|
||||
|
||||
&.open {
|
||||
border: 1px solid #2EA65E;
|
||||
background: #31AF64;
|
||||
}
|
||||
}
|
||||
|
||||
.merge-request,
|
||||
|
|
|
@ -19,11 +19,17 @@
|
|||
in
|
||||
- project = merge_request.target_project
|
||||
= link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
|
||||
%span.merge-request-status.prepend-left-10
|
||||
- if merge_request.merged?
|
||||
MERGED
|
||||
- elsif merge_request.closed?
|
||||
CLOSED
|
||||
|
||||
- if merge_request.merged?
|
||||
%span.merge-request-status.prepend-left-10.merged
|
||||
Merged
|
||||
- elsif merge_request.closed?
|
||||
%span.merge-request-status.prepend-left-10.closed
|
||||
Closed
|
||||
- else
|
||||
%span.merge-request-status.prepend-left-10.open
|
||||
Open
|
||||
|
||||
- if @closed_by_merge_requests.present?
|
||||
%li
|
||||
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Added colored labels to related MR list.
|
||||
merge_request: 7486
|
||||
author: Didem Acet
|
Loading…
Reference in New Issue