diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 19:00:00 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 19:00:00 -0700 |
| commit | f2ea9d9f3fc34d66c8b6c630ef8fb9b810b821e9 (patch) | |
| tree | f720ac49bdf21e4912739b7deccf094a36f8f6bf | |
| parent | b9372c999707558b695fa401b4f660a3d38fce86 (diff) | |
| download | gitlab-ce-fix-sticky-header.tar.gz | |
Improve sticky headers in diffsfix-sticky-header
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
| -rw-r--r-- | app/assets/javascripts/diff.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee index 05f5af42571..069f91c30e1 100644 --- a/app/assets/javascripts/diff.js.coffee +++ b/app/assets/javascripts/diff.js.coffee @@ -37,8 +37,6 @@ class @Diff ) ) - $('.diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height()) - lineNumbers: (line) -> return ([0, 0]) unless line.children().length lines = line.children().slice(0, 2) diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 1747f36dcf3..2b9b6599a7d 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -1,10 +1,9 @@ -.row.prepend-top-20.append-bottom-10 - .col-md-8 - = render 'projects/diffs/stats', diffs: diffs - .col-md-4 - .btn-group.pull-right +.prepend-top-20.append-bottom-20 + .pull-right + .btn-group = inline_diff_btn = parallel_diff_btn + = render 'projects/diffs/stats', diffs: diffs - if show_diff_size_warning?(diffs) = render 'projects/diffs/warning', diffs: diffs @@ -19,3 +18,6 @@ Failed to collect changes %p 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()) |