Skip to content

G
gitlab-ce
Commit e8fcd464 authored by Annabel Dunstone's avatar Annabel Dunstone
Browse files
Options

Check screen width before increasing max position

parent 65a175bb
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
app/assets/javascripts/layout_nav.js.coffee
View file @ e8fcd464
...@@ -3,9 +3,7 @@ class @LayoutNav ...@@ -3,9 +3,7 @@ class @LayoutNav
$('#scrolling-tabs').on 'scroll', -> $('#scrolling-tabs').on 'scroll', ->
currentPosition = $(this).scrollLeft() currentPosition = $(this).scrollLeft()
return if currentPosition == 0 return if currentPosition == 0
if $('.nav-control').length
maxPosition = $(this)[0].scrollWidth - $(this).parent().width() + 59
else
maxPosition = $(this)[0].scrollWidth - $(this).parent().width() maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
maxPosition += 59 if $('.nav-control').length and window.innerWidth > 480
$('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition) $('.fade-out').toggleClass('end-scroll', currentPosition is maxPosition)
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7