diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index b0d846ec1..bbd58e6d5 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -258,23 +258,34 @@ class App.TicketZoom extends App.Controller positionPageHeaderStop: => @main.unbind('scroll', @positionPageHeaderUpdate) + @scrollHeaderPos: undefined + positionPageHeaderUpdate: => headerHeight = @scrollPageHeader.outerHeight() mainScrollHeigth = @main.prop('scrollHeight') mainHeigth = @main.height() - # if page header is possible to use, show page header - top = 0 - if mainScrollHeigth > mainHeigth + headerHeight - scroll = @main.scrollTop() - if scroll <= headerHeight - top = (scroll - headerHeight) + scroll = @main.scrollTop() # if page header is not possible to use - mainScrollHeigth to low - hide page header - else - top = -headerHeight + if not mainScrollHeigth > mainHeigth + headerHeight + @scrollPageHeader.css('transform', "translateY(#{-headerHeight}px)") - @scrollPageHeader.css('transform', "translateY(#{top}px)") + + if scroll > headerHeight + scroll = headerHeight + + if scroll is @scrollHeaderPos + return + + #marginTop: 0 .. headerHeight + @main.css('margin-top', scroll) + # translateY: 0 .. -headerHeight + @ticketZoom.css('transform', "translateY(-#{scroll}px)") + # translateY: headerHeight .. 0 + @scrollPageHeader.css('transform', "translateY(#{scroll - headerHeight}px)") + + @scrollHeaderPos = scroll render: => diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 838fbb206..799f2593a 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -4290,7 +4290,7 @@ footer { .tabsSidebar-sidebarSpacer { margin-right: $sidebarWidth; - transition: margin 500ms; + transition: marginRight 500ms; } .tabsSidebar-sidebarSpacer.is-closed {