Commit d7aecf68 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-sticky-header' into 'master'

Improve sticky headers in diffs

* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab

See merge request !450
parents b9372c99 f2ea9d9f
...@@ -37,8 +37,6 @@ class @Diff ...@@ -37,8 +37,6 @@ class @Diff
) )
) )
$('.diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height())
lineNumbers: (line) -> lineNumbers: (line) ->
return ([0, 0]) unless line.children().length return ([0, 0]) unless line.children().length
lines = line.children().slice(0, 2) lines = line.children().slice(0, 2)
......
.row.prepend-top-20.append-bottom-10 .prepend-top-20.append-bottom-20
.col-md-8 .pull-right
= render 'projects/diffs/stats', diffs: diffs .btn-group
.col-md-4
.btn-group.pull-right
= inline_diff_btn = inline_diff_btn
= parallel_diff_btn = parallel_diff_btn
= render 'projects/diffs/stats', diffs: diffs
- if show_diff_size_warning?(diffs) - if show_diff_size_warning?(diffs)
= render 'projects/diffs/warning', diffs: diffs = render 'projects/diffs/warning', diffs: diffs
...@@ -19,3 +18,6 @@ ...@@ -19,3 +18,6 @@
Failed to collect changes Failed to collect changes
%p %p
Maybe diff is really big and operation failed with timeout. Try to get diff locally Maybe diff is really big and operation failed with timeout. Try to get diff locally
:coffeescript
$('.files .diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height())
Markdown is supported
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