kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Clean up fixed navbar

This commit is contained in:
Annabel Dunstone Gray 2017-05-12 09:42:09 -05:00
parent 0278b91203
commit b29414dfc0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/layout_nav.js
View File

@ -48,8 +48,11 @@ import _ from 'underscore';
}); });
function applyScrollNavClass() { 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); }).call(window);

6
app/assets/stylesheets/framework/header.scss
View File

@ -116,10 +116,10 @@ header {
.navbar-border { .navbar-border {
height: 1px; height: 1px;
position: fixed; position: absolute;
left: 0;
right: 0; right: 0;
top: 50px; left: 0;
bottom: 0;
background-color: $border-color; background-color: $border-color;
opacity: 0; opacity: 0;
} }

2
app/assets/stylesheets/pages/merge_requests.scss
View File

@ -689,7 +689,7 @@
} }
.merge-request-tabs-holder { .merge-request-tabs-holder {
top: 0; top: $header-height;
z-index: 10; z-index: 10;
background-color: $white-light; background-color: $white-light;