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 /app/views/projects | |
| parent | b9372c999707558b695fa401b4f660a3d38fce86 (diff) | |
| download | gitlab-ce-f2ea9d9f3fc34d66c8b6c630ef8fb9b810b821e9.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
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
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()) |