home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Change to xs breakpoint, layout_nav updates

Browse Source
This commit is contained in:
Annabel Dunstone
2016-05-25 17:14:28 -05:00
parent 79f890ca85
commit ec6d456b50
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/layout_nav.js.coffee
+9 -8
View File
@@ -1,13 +1,14 @@
class @LayoutNav
$ ->
$('.fade-left').addClass('end-scroll')
$('.scrolling-tabs').scroll (event) ->
el = $(event.target)
currentPosition = $(this).scrollLeft()
mobileScreenWidth = 480
$('.scrolling-tabs').on 'scroll', (event) ->
$this = $(this)
$el = $(event.target)
currentPosition = $this.scrollLeft()
size = bp.getBreakpointSize()
controlBtnWidth = $('.controls').width()
maxPosition = $(this)[0].scrollWidth - $(this).parent().width()
maxPosition += controlBtnWidth if $('.nav-control').length and $(window).width() > mobileScreenWidth
maxPosition = $this.get(0).scrollWidth - $this.parent().width()
maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
$el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
$el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)
app/assets/stylesheets/framework/nav.scss
+2 -3
View File
@@ -2,7 +2,7 @@
visibility: visible;
opacity: 1;
position: absolute;
bottom: 16px;
bottom: 12px;
width: 43px;
height: 30px;
transition-duration: .3s;
@@ -240,7 +240,7 @@
float: right;
padding: 7px 0 0;
@media (max-width: $screen-xs-min) {
@media (max-width: $screen-xs-max) {
display: none;
}
@@ -310,7 +310,6 @@
.nav-control {
.fade-right {
right: 58px;
@media (min-width: $screen-xs-max) {
right: 67px;