Merge branch 'closed-by-alignment' into 'master'
Related merge request text alignment Fixed the alignment of the text 'When this merge request is accepted...' on issues page ![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png) See merge request !4251
This commit is contained in:
commit
49343f9a31
|
@ -91,8 +91,3 @@ form.edit-issue {
|
||||||
.issue-form .select2-container {
|
.issue-form .select2-container {
|
||||||
width: 250px !important;
|
width: 250px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.issue-closed-by-widget {
|
|
||||||
color: $gl-text-color;
|
|
||||||
margin-left: 52px;
|
|
||||||
}
|
|
||||||
|
|
|
@ -24,5 +24,8 @@
|
||||||
MERGED
|
MERGED
|
||||||
- elsif merge_request.closed?
|
- elsif merge_request.closed?
|
||||||
CLOSED
|
CLOSED
|
||||||
- if @closed_by_merge_requests.present?
|
%li
|
||||||
|
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
|
||||||
|
- if @closed_by_merge_requests.present?
|
||||||
|
%li
|
||||||
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
|
= render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
|
||||||
|
|
Loading…
Reference in New Issue