kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'affix-assignee' into 'master' 

Affix milestone/assignee UI element

See merge request !1536
This commit is contained in:
Dmitriy Zaporozhets 2015-02-18 05:42:24 +00:00
parent 19eb86388a 896c046217
commit d905a431e8
9 changed files with 162 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/issue.js.coffee
View File

@ -15,3 +15,9 @@ class @Issue
"issue"
updateTaskState
)
$('.issuable-affix').affix offset:
top: ->
@top = $('.issue-details').outerHeight(true) + 25
bottom: ->
@bottom = $('.footer').outerHeight(true)

6
app/assets/javascripts/merge_request.js.coffee
View File

@ -20,6 +20,12 @@ class @MergeRequest
if $("a.btn-close").length
$("li.task-list-item input:checkbox").prop("disabled", false)
$('.issuable-affix').affix offset:
top: ->
@top = $('.merge-request-details').outerHeight(true) + 70
bottom: ->
@bottom = $('.footer').outerHeight(true)
# Local jQuery finder
$: (selector) ->
this.$el.find(selector)

25
app/assets/stylesheets/sections/issuable.scss Normal file
View File

@ -0,0 +1,25 @@
@media (max-width: $screen-sm-max) {
.issuable-affix {
margin-top: 20px;
}
}
@media (max-width: $screen-md-max) {
.issuable-affix {
position: static;
}
}
@media (min-width: $screen-md-max) {
.issuable-affix {
&.affix-top {
position: static;
}
&.affix {
position: fixed;
top: 70px;
width: 220px;
}
}
}

9
app/assets/stylesheets/sections/issues.scss
View File

@ -94,9 +94,16 @@
}
}
.issue-show-labels .color-label {
.issue-show-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
}
}
}
form.edit-issue {
margin: 0;

7
app/assets/stylesheets/sections/merge_requests.scss
View File

@ -95,7 +95,14 @@
color: #999;
.merge-request-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
}
}
}
}
}

4
app/views/projects/issues/_discussion.html.haml
View File

@ -14,7 +14,7 @@
.voting_notes#notes= render "projects/notes/notes_with_form"
.col-md-3
%div
.issuable-affix
.clearfix
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
= cross_project_reference(@project, @issue)
@ -34,4 +34,4 @@
.issue-show-labels
- @issue.labels.each do |label|
= link_to project_issues_path(@project, label_name: label.name) do
%p= render_colored_label(label)
= render_colored_label(label)

3
app/views/projects/issues/show.html.haml
View File

@ -1,3 +1,5 @@
.issue
.issue-details
%h4.page-title
.issue-box{ class: issue_box_class(@issue) }
- if @issue.closed?
@ -34,4 +36,5 @@
= markdown(@issue.description, parse_tasks: true)
%hr
.issue-discussion
= render "projects/issues/discussion"

3
app/views/projects/merge_requests/_discussion.html.haml
View File

@ -10,6 +10,7 @@
= render "projects/merge_requests/show/participants"
= render "projects/notes/notes_with_form"
.col-md-3
.issuable-affix
.clearfix
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
= cross_project_reference(@project, @merge_request)
@ -28,4 +29,4 @@
.merge-request-show-labels
- @merge_request.labels.each do |label|
= link_to project_merge_requests_path(@project, label_name: label.name) do
%p= render_colored_label(label)
= render_colored_label(label)

1
app/views/projects/merge_requests/_show.html.haml
View File

@ -1,4 +1,5 @@
.merge-request{'data-url' => project_merge_request_path(@project, @merge_request)}
.merge-request-details
= render "projects/merge_requests/show/mr_title"
%hr
= render "projects/merge_requests/show/mr_box"