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

Merge branch 'fix-sticky-header' into 'master'
d7aecf68 · Dmitriy Zaporozhets · b9372c99 · f2ea9d9f · d7aecf68 · d7aecf68
Commit d7aecf68 authored Mar 25, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

diff.js.coffee app/assets/javascripts/diff.js.coffee +0 -2

_diffs.html.haml app/views/projects/diffs/_diffs.html.haml +7 -5

No files found.
--- 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)

--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
-.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())