Skip to content
Snippets Groups Projects
Verified Commit 4b7c9c7f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Revert sidebar position for issue and merge request 


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 8dc4c7b4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 108 deletions
app/assets/javascripts/issuable_context.js.coffee
+ 1
− 1
View file @ 4b7c9c7f
@@ -18,7 +18,7 @@ class @IssuableContext
@@ -18,7 +18,7 @@ class @IssuableContext
   
$('.issuable-affix').affix offset: $('.issuable-affix').affix offset:
top: -> top: ->
@top = ($('.issuable-affix').offset().top - 60) @top = ($('.issuable-affix').offset().top - 70)
bottom: -> bottom: ->
@bottom = $('.footer').outerHeight(true) @bottom = $('.footer').outerHeight(true)
   
app/assets/stylesheets/pages/issuable.scss
+ 2
− 9
View file @ 4b7c9c7f
@@ -18,7 +18,7 @@
@@ -18,7 +18,7 @@
   
&.affix { &.affix {
position: fixed; position: fixed;
top: 60px; top: 70px;
margin-right: 35px; margin-right: 35px;
} }
} }
@@ -39,16 +39,9 @@
@@ -39,16 +39,9 @@
section { section {
border-right: 1px solid $border-white-light; border-right: 1px solid $border-white-light;
   
> .tab-content { .issuable-discussion {
margin-right: 1px; 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
+ 0
− 7
View file @ 4b7c9c7f
@@ -144,10 +144,3 @@ form.edit-issue {
@@ -144,10 +144,3 @@ form.edit-issue {
.issue-form .select2-container { .issue-form .select2-container {
width: 250px !important; width: 250px !important;
} }
.issue-discussion {
.common-note-form {
border-right: 1px solid $border-white-light;
}
}
app/views/projects/issues/_discussion.html.haml
+ 0
− 6
View file @ 4b7c9c7f
@@ -5,11 +5,5 @@
@@ -5,11 +5,5 @@
- else - 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' = 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 #notes
= render 'projects/notes/notes_with_form' = render 'projects/notes/notes_with_form'
app/views/projects/issues/show.html.haml
+ 22
− 16
View file @ 4b7c9c7f
@@ -37,24 +37,30 @@
@@ -37,24 +37,30 @@
Edit Edit
   
.issue-details.issuable-details .issue-details.issuable-details
.detail-page-description.gray-content-block.second-block
%h2.title
= markdown escape_once(@issue.title), pipeline: :single_line
%div
- if @issue.description.present?
.description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
.wiki
= preserve do
= markdown(@issue.description, cache_key: [@issue, "description"])
%textarea.hidden.js-task-list-field
= @issue.description
.merge-requests
= render 'merge_requests'
.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 .row
%section.col-md-9 %section.col-md-9
.detail-page-description.gray-content-block .issuable-discussion
%h2.title
= markdown escape_once(@issue.title), pipeline: :single_line
%div
- if @issue.description.present?
.description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
.wiki
= preserve do
= markdown(@issue.description, cache_key: [@issue, "description"])
%textarea.hidden.js-task-list-field
= @issue.description
.merge-requests
= render 'merge_requests'
.issue-discussion
= render 'projects/issues/discussion' = render 'projects/issues/discussion'
   
%aside.col-md-3 %aside.col-md-3
app/views/projects/merge_requests/_discussion.html.haml
+ 0
− 3
View file @ 4b7c9c7f
@@ -5,7 +5,4 @@
@@ -5,7 +5,4 @@
- if @merge_request.closed? - 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" = 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" #notes= render "projects/notes/notes_with_form"
app/views/projects/merge_requests/_show.html.haml
+ 67
− 65
View file @ 4b7c9c7f
@@ -8,79 +8,81 @@
@@ -8,79 +8,81 @@
= render "projects/merge_requests/show/mr_title" = render "projects/merge_requests/show/mr_title"
   
.merge-request-details.issuable-details .merge-request-details.issuable-details
.row = render "projects/merge_requests/show/mr_box"
%section.col-md-9 .append-bottom-default.mr-source-target.prepend-top-default
= render "projects/merge_requests/show/mr_box" - if @merge_request.open?
.append-bottom-default.mr-source-target.prepend-top-default .pull-right
- if @merge_request.open? - if @merge_request.source_branch_exists?
.pull-right = link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do
- if @merge_request.source_branch_exists? = icon('cloud-download fw')
= link_to "#modal_merge_info", class: "btn btn-sm", "data-toggle" => "modal" do Check out branch
= icon('cloud-download fw')
Check out branch
   
%span.dropdown %span.dropdown
%a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} } %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
= icon('download') = icon('download')
Download as Download as
%span.caret %span.caret
%ul.dropdown-menu %ul.dropdown-menu
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch) %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff) %li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.normal .normal
%span Request to merge %span Request to merge
%span.label-branch= source_branch_with_namespace(@merge_request) %span.label-branch= source_branch_with_namespace(@merge_request)
%span into %span into
= link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do = link_to namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch" do
= @merge_request.target_branch = @merge_request.target_branch
   
= render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/widget/show.html.haml" = render "projects/merge_requests/widget/show.html.haml"
   
- if @merge_request.open? && @merge_request.source_branch_exists? && @merge_request.can_be_merged? && @merge_request.can_be_merged_by?(current_user) - if @merge_request.open? && @merge_request.source_branch_exists? && @merge_request.can_be_merged? && @merge_request.can_be_merged_by?(current_user)
.light.prepend-top-default .light.prepend-top-default
You can also accept this merge request manually using the You can also accept this merge request manually using the
= succeed '.' do = succeed '.' do
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
   
- if @commits.present? - if @commits.present?
%ul.merge-request-tabs.center-top-menu.no-top.no-bottom %ul.merge-request-tabs.center-top-menu.no-top.no-bottom
%li.notes-tab %li.notes-tab
= link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
Discussion Discussion
%span.badge= @merge_request.mr_and_commit_notes.user.count %span.badge= @merge_request.mr_and_commit_notes.user.count
%li.commits-tab %li.commits-tab
= link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
Commits Commits
%span.badge= @commits.size %span.badge= @commits.size
- if @ci_commit - if @ci_commit
%li.builds-tab %li.builds-tab
= link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
Builds Builds
%span.badge= @statuses.size %span.badge= @statuses.size
%li.diffs-tab %li.diffs-tab
= link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
Changes Changes
%span.badge= @merge_request.diffs.size %span.badge= @merge_request.diffs.size
   
.tab-content .tab-content
#notes.notes.tab-pane.voting_notes #notes.notes.tab-pane.voting_notes
= render "projects/merge_requests/discussion" .gray-content-block.second-block.oneline-block
#commits.commits.tab-pane = render 'votes/votes_block', votable: @merge_request
- # This tab is always loaded via AJAX
#builds.builds.tab-pane
- # This tab is always loaded via AJAX
#diffs.diffs.tab-pane
- # This tab is always loaded via AJAX
   
.mr-loading-status .row
= spinner %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'
   
%aside.col-md-3 #commits.commits.tab-pane
= render 'shared/issuable/sidebar', issuable: @merge_request - # This tab is always loaded via AJAX
#builds.builds.tab-pane
= render 'shared/show_aside' - # This tab is always loaded via AJAX
#diffs.diffs.tab-pane
- # This tab is always loaded via AJAX
   
.mr-loading-status
= spinner
   
:javascript :javascript
var merge_request; var merge_request;
app/views/projects/merge_requests/show/_mr_box.html.haml
+ 1
− 1
View file @ 4b7c9c7f
.detail-page-description.gray-content-block.middle-block .detail-page-description.gray-content-block.second-block
%h2.title %h2.title
= markdown escape_once(@merge_request.title), pipeline: :single_line = markdown escape_once(@merge_request.title), pipeline: :single_line
   
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