BigW Consortium Gitlab

Commit b8113334 by Riyad Preukschas

Highlight voting notes for issues and merge requests

parent 0546b9c6
...@@ -81,6 +81,19 @@ ...@@ -81,6 +81,19 @@
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
/* mark vote notes */
.voting_notes .note {
padding: 8px 0 8px 12px;
&.upvote {
padding-left: 8px;
border-left: 4px solid #468847;
}
&.downvote {
padding-left: 8px;
border-left: 4px solid #B94A48;
}
}
.notes-status { .notes-status {
margin: 18px; margin: 18px;
} }
......
...@@ -6,4 +6,12 @@ module NotesHelper ...@@ -6,4 +6,12 @@ module NotesHelper
def loading_new_notes? def loading_new_notes?
params[:loading_new].present? params[:loading_new].present?
end end
def note_vote_class(note)
if note.upvote?
"vote upvote"
elsif note.downvote?
"vote downvote"
end
end
end end
...@@ -61,4 +61,4 @@ ...@@ -61,4 +61,4 @@
= markdown @issue.description = markdown @issue.description
.issue_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue" .issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
%i.icon-list-alt %i.icon-list-alt
Diff Diff
.merge_request_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" } .merge_request_notes.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
= render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request") = render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
.merge-request-diffs .merge-request-diffs
= render "merge_requests/show/diffs" if @diffs = render "merge_requests/show/diffs" if @diffs
......
%li{id: dom_id(note), class: "note"} %li{id: dom_id(note), class: "note #{note_vote_class(note)}"}
= image_tag gravatar_icon(note.author.email), class: "avatar s32" = image_tag gravatar_icon(note.author.email), class: "avatar s32"
%div.note-author %div.note-author
%strong= note.author_name %strong= note.author_name
......
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