Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ec6d456b
Commit
ec6d456b
authored
May 25, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change to xs breakpoint, layout_nav updates
parent
79f890ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/layout_nav.js.coffee
app/assets/javascripts/layout_nav.js.coffee
+9
-8
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+2
-3
No files found.
app/assets/javascripts/layout_nav.js.coffee
View file @
ec6d456b
class
@
LayoutNav
class
@
LayoutNav
$
->
$
->
$
(
'.fade-left'
).
addClass
(
'end-scroll'
)
$
(
'.fade-left'
).
addClass
(
'end-scroll'
)
$
(
'.scrolling-tabs'
).
scroll
(
event
)
->
$
(
'.scrolling-tabs'
).
on
'scroll'
,
(
event
)
->
el
=
$
(
event
.
target
)
$this
=
$
(
this
)
currentPosition
=
$
(
this
).
scrollLeft
()
$el
=
$
(
event
.
target
)
mobileScreenWidth
=
480
currentPosition
=
$this
.
scrollLeft
()
size
=
bp
.
getBreakpointSize
()
controlBtnWidth
=
$
(
'.controls'
).
width
()
controlBtnWidth
=
$
(
'.controls'
).
width
()
maxPosition
=
$
(
this
)[
0
].
scrollWidth
-
$
(
this
)
.
parent
().
width
()
maxPosition
=
$
this
.
get
(
0
).
scrollWidth
-
$this
.
parent
().
width
()
maxPosition
+=
controlBtnWidth
if
$
(
'.nav-control'
).
length
and
$
(
window
).
width
()
>
mobileScreenWid
th
maxPosition
+=
controlBtnWidth
if
size
isnt
'xs'
and
$
(
'.nav-control'
).
leng
th
el
.
find
(
'.fade-left'
).
toggleClass
(
'end-scroll'
,
currentPosition
is
0
)
$
el
.
find
(
'.fade-left'
).
toggleClass
(
'end-scroll'
,
currentPosition
is
0
)
el
.
find
(
'.fade-right'
).
toggleClass
(
'end-scroll'
,
currentPosition
is
maxPosition
)
$
el
.
find
(
'.fade-right'
).
toggleClass
(
'end-scroll'
,
currentPosition
is
maxPosition
)
app/assets/stylesheets/framework/nav.scss
View file @
ec6d456b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
visibility
:
visible
;
visibility
:
visible
;
opacity
:
1
;
opacity
:
1
;
position
:
absolute
;
position
:
absolute
;
bottom
:
1
6
px
;
bottom
:
1
2
px
;
width
:
43px
;
width
:
43px
;
height
:
30px
;
height
:
30px
;
transition-duration
:
.3s
;
transition-duration
:
.3s
;
...
@@ -240,7 +240,7 @@
...
@@ -240,7 +240,7 @@
float
:
right
;
float
:
right
;
padding
:
7px
0
0
;
padding
:
7px
0
0
;
@media
(
max-width
:
$screen-xs-m
in
)
{
@media
(
max-width
:
$screen-xs-m
ax
)
{
display
:
none
;
display
:
none
;
}
}
...
@@ -310,7 +310,6 @@
...
@@ -310,7 +310,6 @@
.nav-control
{
.nav-control
{
.fade-right
{
.fade-right
{
right
:
58px
;
@media
(
min-width
:
$screen-xs-max
)
{
@media
(
min-width
:
$screen-xs-max
)
{
right
:
67px
;
right
:
67px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment