Add close button to MR comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
555c25e601
commit
f0750b9166
|
@ -118,7 +118,6 @@
|
|||
@extend .btn-primary;
|
||||
}
|
||||
|
||||
&.btn-close,
|
||||
&.btn-remove {
|
||||
@extend .btn-danger;
|
||||
}
|
||||
|
@ -143,6 +142,22 @@
|
|||
line-height: 16px;
|
||||
margin: 2px;
|
||||
}
|
||||
|
||||
&.btn-close {
|
||||
color: #B94A48;
|
||||
font-weight: bold;
|
||||
&:hover {
|
||||
color: #B94A48;
|
||||
}
|
||||
}
|
||||
|
||||
&.btn-reopen {
|
||||
color: #468847;
|
||||
font-weight: bold;
|
||||
&:hover {
|
||||
color: #468847;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn-block {
|
||||
|
|
|
@ -65,21 +65,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.btn.close_issue {
|
||||
color: #B94A48;
|
||||
font-weight: bold;
|
||||
&:hover {
|
||||
color: #B94A48;
|
||||
}
|
||||
}
|
||||
.btn.reopen_issue {
|
||||
color: #468847;
|
||||
font-weight: bold;
|
||||
&:hover {
|
||||
color: #468847;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 800px) { .issues_filters select { width: 160px; } }
|
||||
@media (min-width: 1200px) { .issues_filters select { width: 220px; } }
|
||||
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
New Issue
|
||||
- if can?(current_user, :modify_issue, @issue)
|
||||
- if @issue.closed?
|
||||
= link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped reopen_issue"
|
||||
= link_to 'Reopen', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped btn-reopen"
|
||||
- else
|
||||
= link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
|
||||
= link_to 'Close', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
|
||||
|
||||
= link_to edit_project_issue_path(@project, @issue), class: "btn grouped" do
|
||||
%i.icon-edit
|
||||
|
@ -54,9 +54,9 @@
|
|||
- content_for :note_actions do
|
||||
- if can?(current_user, :modify_issue, @issue)
|
||||
- if @issue.closed?
|
||||
= link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped reopen_issue"
|
||||
= link_to 'Reopen Issue', project_issue_path(@project, @issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn grouped btn-reopen"
|
||||
- else
|
||||
= link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped close_issue", title: "Close Issue"
|
||||
= link_to 'Close Issue', project_issue_path(@project, @issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close Issue"
|
||||
|
||||
.participants
|
||||
%cite.cgray #{@issue.participants.count} participants
|
||||
|
|
|
@ -22,6 +22,12 @@
|
|||
%i.icon-list-alt
|
||||
Diff
|
||||
|
||||
- content_for :note_actions do
|
||||
- if can?(current_user, :modify_merge_request, @merge_request)
|
||||
- unless @merge_request.closed?
|
||||
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn grouped btn-close", title: "Close merge request"
|
||||
|
||||
|
||||
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
|
||||
= render "projects/notes/notes_with_form"
|
||||
.diffs.tab-content
|
||||
|
|
Loading…
Reference in New Issue