diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-12 09:42:09 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-12 09:42:09 -0500 |
| commit | b29414dfc0b5f24c3773596eae7bb9a70275a44e (patch) | |
| tree | 3687c23b6e47d1ec561eb8e7a71ff1bc06c7f330 | |
| parent | 0278b912038b1c70f289ab915c4d0752f9aff4b0 (diff) | |
| download | gitlab-ce-b29414dfc0b5f24c3773596eae7bb9a70275a44e.tar.gz | |
Clean up fixed navbar
| -rw-r--r-- | app/assets/javascripts/layout_nav.js | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js index 8cc0b6d66de..71064ccc539 100644 --- a/app/assets/javascripts/layout_nav.js +++ b/app/assets/javascripts/layout_nav.js @@ -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); diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 3014b133754..586511fe8d4 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -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; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index d9ba1d4de4d..bb47e24d986 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -689,7 +689,7 @@ } .merge-request-tabs-holder { - top: 0; + top: $header-height; z-index: 10; background-color: $white-light; |