Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-22 09:01:27 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-22 09:01:27 +0300
commit87b04868a11a840d04a86ea1f8b2af9ec94efbd8 (patch)
tree571ab1c6be25f0650b08cd98ff993cc3875c9614 /app/views/projects/merge_requests
parent52902f54346acb8076594a85e34f16605790b49f (diff)
Create Aside js class for handling all sidebars in UI for mobile devices
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/_discussion.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml
index ca4ce26c676..69bbdf49396 100644
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
@@ -6,10 +6,10 @@
= link_to 'Reopen', project_merge_request_path(@project, @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"
.row
- .col-md-9
+ %section.col-md-9
= render "projects/merge_requests/show/participants"
= render "projects/notes/notes_with_form"
- .col-md-3
+ %aside.col-md-3
.issuable-affix
.clearfix
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
@@ -29,3 +29,5 @@
- @merge_request.labels.each do |label|
= link_to project_merge_requests_path(@project, label_name: label.name) do
= render_colored_label(label)
+ = link_to '#aside', class: 'show-aside' do
+ %i.fa.fa-angle-left