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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b29414df
Commit
b29414df
authored
May 12, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up fixed navbar
parent
0278b912
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
app/assets/javascripts/layout_nav.js
app/assets/javascripts/layout_nav.js
+5
-2
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+3
-3
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
No files found.
app/assets/javascripts/layout_nav.js
View file @
b29414df
...
...
@@ -48,8 +48,11 @@ import _ from 'underscore';
});
function
applyScrollNavClass
()
{
$
(
'
.navbar-border
'
).
css
(
'
opacity
'
,
$
(
window
).
scrollTop
()
/
40
);
const
scrollOpacityHeight
=
40
;
$
(
'
.navbar-border
'
).
css
(
'
opacity
'
,
Math
.
min
(
$
(
window
).
scrollTop
()
/
scrollOpacityHeight
,
1
));
}
$
(
window
).
scroll
(
_
.
throttle
(
applyScrollNavClass
,
100
));
$
(()
=>
{
$
(
window
).
on
(
'
scroll
'
,
_
.
throttle
(
applyScrollNavClass
,
100
));
});
}).
call
(
window
);
app/assets/stylesheets/framework/header.scss
View file @
b29414df
...
...
@@ -116,10 +116,10 @@ header {
.navbar-border
{
height
:
1px
;
position
:
fixed
;
left
:
0
;
position
:
absolute
;
right
:
0
;
top
:
50px
;
left
:
0
;
bottom
:
0
;
background-color
:
$border-color
;
opacity
:
0
;
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
b29414df
...
...
@@ -689,7 +689,7 @@
}
.merge-request-tabs-holder
{
top
:
0
;
top
:
$header-height
;
z-index
:
10
;
background-color
:
$white-light
;
...
...
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