From 1911811438606e3ca8c6629ec2900afc5ba1e11a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 11 Dec 2015 19:48:11 +0100 Subject: [PATCH] Move awards back to gray panel and few improvements to sidebar Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/pages/awards.scss | 1 - app/assets/stylesheets/pages/issuable.scss | 1 + app/views/projects/issues/_discussion.html.haml | 3 +++ app/views/projects/issues/show.html.haml | 2 -- app/views/projects/merge_requests/_discussion.html.haml | 3 +++ app/views/projects/merge_requests/_show.html.haml | 1 - app/views/projects/merge_requests/show/_mr_box.html.haml | 2 -- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss index 895bafebcef..f6d85221484 100644 --- a/app/assets/stylesheets/pages/awards.scss +++ b/app/assets/stylesheets/pages/awards.scss @@ -1,7 +1,6 @@ .awards { @include clearfix; line-height: 34px; - margin-top: $gl-padding; .award { @include border-radius(5px); diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 1f1d720ae4b..797a0af3720 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -57,6 +57,7 @@ margin-right: 1px; } + .issue-discussion > .gray-content-block, > .gray-content-block { margin-top: 0; border-top: none; diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 86d3dc546ba..405bae1bbb9 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -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' diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 79c9ef6b3c3..cc2cf8c8716 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 399e9cc1e1b..7a7428d35cc 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -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" diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index b7b2859f95b..04f8fd74422 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index 66433c6d4fe..9bfe202589e 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -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