Merge branch 'revert-sidebar' into 'master'

Revert sidebar position for issue and merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @creamzy @skyruler 

See merge request !2132

app/assets/javascripts/issuable_context.js.coffee

@@ -18,7 +18,7 @@ class @IssuableContext
 
       $('.issuable-affix').affix offset:
         top: ->
-          @top = ($('.issuable-affix').offset().top - 60)
+          @top = ($('.issuable-affix').offset().top - 70)
         bottom: ->
           @bottom = $('.footer').outerHeight(true)
 

app/assets/stylesheets/pages/issuable.scss

@@ -18,7 +18,7 @@
 
     &.affix {
       position: fixed;
-      top: 60px;
+      top: 70px;
       margin-right: 35px;
     }
   }
@@ -39,16 +39,9 @@
   section {
     border-right: 1px solid $border-white-light;
 
-    > .tab-content {
+    .issuable-discussion {
       margin-right: 1px;
     }
-
-    .issue-discussion > .gray-content-block,
-    > .gray-content-block {
-      margin-top: 0;
-      border-top: none;
-      margin-right: -15px;
-    }
   }
 }
 

app/assets/stylesheets/pages/issues.scss

@@ -144,10 +144,3 @@ form.edit-issue {
 .issue-form .select2-container {
   width: 250px !important;
 }
-
-
-.issue-discussion {
-  .common-note-form {
-    border-right: 1px solid $border-white-light;
-  }
-}

app/views/projects/issues/_discussion.html.haml

@@ -5,11 +5,5 @@
     - 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
-
-- if @closed_by_merge_requests.present?
-  = render 'projects/issues/closed_by_box'
-
 #notes
   = render 'projects/notes/notes_with_form'

app/views/projects/issues/show.html.haml

@@ -37,9 +37,7 @@
           Edit
 
   .issue-details.issuable-details
-    .row
-      %section.col-md-9
-        .detail-page-description.gray-content-block
+    .detail-page-description.gray-content-block.second-block
       %h2.title
         = markdown escape_once(@issue.title), pipeline: :single_line
       %div
@@ -54,7 +52,15 @@
         .merge-requests
           = render 'merge_requests'
 
-        .issue-discussion
+    .gray-content-block.second-block.oneline-block
+      = render 'votes/votes_block', votable: @issue
+
+    - if @closed_by_merge_requests.present?
+      = render 'projects/issues/closed_by_box'
+
+    .row
+      %section.col-md-9
+        .issuable-discussion
           = render 'projects/issues/discussion'
 
       %aside.col-md-3

app/views/projects/merge_requests/_discussion.html.haml

@@ -5,7 +5,4 @@
     - 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"

app/views/projects/merge_requests/_show.html.haml

@@ -8,8 +8,6 @@
   = render "projects/merge_requests/show/mr_title"
 
   .merge-request-details.issuable-details
-    .row
-      %section.col-md-9
     = render "projects/merge_requests/show/mr_box"
     .append-bottom-default.mr-source-target.prepend-top-default
       - if @merge_request.open?
@@ -65,7 +63,17 @@
 
       .tab-content
         #notes.notes.tab-pane.voting_notes
+          .gray-content-block.second-block.oneline-block
+            = render 'votes/votes_block', votable: @merge_request
+
+          .row
+            %section.col-md-9
+              .issuable-discussion
                 = render "projects/merge_requests/discussion"
+            %aside.col-md-3
+              = render 'shared/issuable/sidebar', issuable: @merge_request
+            = render 'shared/show_aside'
+
         #commits.commits.tab-pane
           - # This tab is always loaded via AJAX
         #builds.builds.tab-pane
@@ -76,12 +84,6 @@
       .mr-loading-status
         = spinner
 
-      %aside.col-md-3
-        = render 'shared/issuable/sidebar', issuable: @merge_request
-
-      = render 'shared/show_aside'
-
-
 :javascript
   var merge_request;
 

app/views/projects/merge_requests/show/_mr_box.html.haml

-.detail-page-description.gray-content-block.middle-block
+.detail-page-description.gray-content-block.second-block
   %h2.title
     = markdown escape_once(@merge_request.title), pipeline: :single_line