Commit 19118114 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Move awards back to gray panel and few improvements to sidebar

Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b4ea6ad1
.awards {
@include clearfix;
line-height: 34px;
margin-top: $gl-padding;
.award {
@include border-radius(5px);
......
......@@ -57,6 +57,7 @@
margin-right: 1px;
}
.issue-discussion > .gray-content-block,
> .gray-content-block {
margin-top: 0;
border-top: none;
......
......@@ -5,5 +5,8 @@
- else
= link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close}, status_only: true), method: :put, class: 'btn btn-grouped btn-close js-note-target-close', title: 'Close Issue'
.gray-content-block.second-block.oneline-block
= render 'votes/votes_block', votable: @issue
#notes
= render 'projects/notes/notes_with_form'
......@@ -53,8 +53,6 @@
.merge-requests
= render 'merge_requests'
= render 'votes/votes_block', votable: @issue
- if @closed_by_merge_requests.present?
= render 'projects/issues/closed_by_box'
.issue-discussion
......
......@@ -5,4 +5,7 @@
- if @merge_request.closed?
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
.gray-content-block.second-block.oneline-block
= render 'votes/votes_block', votable: @merge_request
#notes= render "projects/notes/notes_with_form"
......@@ -64,7 +64,6 @@
.tab-content
#notes.notes.tab-pane.voting_notes
.content-separator
= render "projects/merge_requests/discussion"
#commits.commits.tab-pane
- # This tab is always loaded via AJAX
......
......@@ -10,5 +10,3 @@
= markdown(@merge_request.description, cache_key: [@merge_request, "description"])
%textarea.hidden.js-task-list-field
= @merge_request.description
= render 'votes/votes_block', votable: @merge_request
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